diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e0907d..259aa4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## Released 
 
+## [2.7.8](https://github.com/kabisa/wuunder-webshopplugin-woocommerce/tag/2.7.8) - 2019-10-30
+
+### Added
+-   Support sanitize functions
+
+### Fixed
+-   Removed curl functions and use WP functions for getting filesize of images 
+
 ## [2.7.7](https://github.com/kabisa/wuunder-webshopplugin-woocommerce/tag/2.7.7) - 2019-10-11
 
 ### Added
diff --git a/includes/checkout.php b/includes/checkout.php
index 0249446..472eefc 100644
--- a/includes/checkout.php
+++ b/includes/checkout.php
@@ -189,12 +189,12 @@ function wcwp_update_parcelshop_id($order_id)
 add_action('woocommerce_checkout_process', 'wcwp_check_parcelshop_selection');
 function wcwp_check_parcelshop_selection()
 {
-    if ('wuunder_parcelshop' === $_POST['shipping_method'][0]) {
+    if ('wuunder_parcelshop' === sanitize_text_field($_POST['shipping_method'][0])) {
         if (!$_POST['parcelshop_id']) {
             wc_add_notice(__('Kies eerst een <strong>parcelshop</strong>'), 'error');
         }
 
-        if ($_POST['shipping_country'] != $_POST['parcelshop_country']) {
+        if (!isset($_POST['shipping_country']) || $_POST['shipping_country'] != $_POST['parcelshop_country']) {
             wc_add_notice(__('Het <strong>land van de verzendgegevens</strong> moet overeenkomen met het <strong>land van de parcelshop</strong> '), 'error');
         }
     }
diff --git a/includes/parcelshop.php b/includes/parcelshop.php
index 69cd6c6..15b11d7 100644
--- a/includes/parcelshop.php
+++ b/includes/parcelshop.php
@@ -7,7 +7,7 @@ function wcwp_parcelShopLocator()
     $apiKey = ( 'productie' == $status ? get_option( 'wc_wuunder_api' ) : get_option( 'wc_wuunder_test_api' ) );
 
     if( ! empty( $_POST['address'] ) ) {
-        $shipping_address = $_POST['address'];
+        $shipping_address = sanitize_text_field($_POST['address']);
     } else {
         $shipping_address =  '';
         $shipping_address .= ( ! empty(WC()->customer->get_shipping_address() )  ? WC()->customer->get_shipping_address()  . ' ' : '' );
@@ -43,7 +43,7 @@ function wcwp_getAddress() {
     $shipping_address = null;
 
     if(!empty($_POST['address'])) {
-        $shipping_address = $_POST['address'];
+        $shipping_address = sanitize_text_field($_POST['address']);
     } else {
 
         $shipping_address .= (!empty(WC()->customer->get_shipping_address())  ? WC()->customer->get_shipping_address()  . " " : "");
@@ -58,7 +58,6 @@ function wcwp_getAddress() {
 
 function wcwp_getParcelshopAddress() {
     $shipping_address = null;
-
     if(empty($_POST['parcelshop_id'])) {
         echo null;
     } else {
@@ -70,7 +69,7 @@ function wcwp_getParcelshopAddress() {
         $parcelshopRequest = $connector->getParcelshopById();
         $parcelshopConfig = new \Wuunder\Api\Config\ParcelshopConfig();
 
-        $parcelshopConfig->setId($_POST['parcelshop_id']);
+        $parcelshopConfig->setId(sanitize_text_field($_POST['parcelshop_id']));
 
         if ($parcelshopConfig->validate()) {
             $parcelshopRequest->setConfig($parcelshopConfig);
diff --git a/includes/wcwuunder-create.php b/includes/wcwuunder-create.php
index 5ae601b..098c34a 100644
--- a/includes/wcwuunder-create.php
+++ b/includes/wcwuunder-create.php
@@ -12,7 +12,7 @@ public function __construct() {
             $this->version_obj = array(
                 'product'   => 'Woocommerce extension',
                 'version'   => array(
-                    'build'     => '2.7.7 ',
+                    'build'     => '2.7.8 ',
                     'plugin'    => '2.0' ),
                 'platform'  => array(
                     'name'      => 'Woocommerce',
@@ -33,8 +33,8 @@ public function wcwp_sample_admin_notice__error() {
             if ( 'error' == isset( $_GET['notice'] ) && $_GET['notice'] ) {
 
                 $class = 'notice notice-error';
-                $message = __( '<b>Het aanmaken van het label voor #' . $_GET['id'] . ' is mislukt</b>', 'woocommerce-wuunder' );
-                $errors = $_GET['error_melding'];
+                $message = __( '<b>Het aanmaken van het label voor #' . sanitize_text_field($_GET['id']) . ' is mislukt</b>', 'woocommerce-wuunder' );
+                $errors = sanitize_text_field($_GET['error_melding']);
                 $message .= '<ul style="margin:0 0 0 20px; padding:0; list-style:inherit;">';
                 foreach ( $errors as $error ) {
                     $message .= '<li>' . $error . '</li>';
@@ -46,7 +46,7 @@ public function wcwp_sample_admin_notice__error() {
             } elseif ( 'success' == isset( $_GET['notice'] ) && $_GET['notice'] ) {
 
                 $class = 'notice notice-success';
-                $message = __( 'Het verzendlabel voor #' . $_GET['id'] . ' is aangemaakt', 'woocommerce-wuunder' );
+                $message = __( 'Het verzendlabel voor #' . sanitize_text_field($_GET['id']) . ' is aangemaakt', 'woocommerce-wuunder' );
                 printf( '<div class="%1$s"><p>%2$s</p></div>', $class, $message );
 
             }
@@ -153,9 +153,9 @@ private function wcwp_setBookingConfig($orderId ) {
          * Returns the user to the original order page with the redirect.
          */
         public function wcwp_generateBookingUrl() {
-            if (isset($_REQUEST['order']) && $_REQUEST['action'] === "bookorder") {
+            if (isset($_REQUEST['order']) && sanitize_text_field($_REQUEST['action']) === "bookorder") {
                 wcwp_log( 'info', 'Generating the booking url' );
-                $order_id = $_REQUEST['order'];
+                $order_id = sanitize_text_field($_REQUEST['order']);
 
                 $status = get_option( 'wc_wuunder_api_status' );
                 $apiKey = ( 'productie' == $status ? get_option( 'wc_wuunder_api' ) : get_option( 'wc_wuunder_test_api' ) );
@@ -379,31 +379,11 @@ function wcwp_curl_get_file_size($url ) {
             // Assume failure.
             $result = -1;
 
-            $curl = curl_init( $url );
-
-            // Issue a HEAD request and follow any redirects.
-            curl_setopt( $curl, CURLOPT_NOBODY, true );
-            curl_setopt( $curl, CURLOPT_HEADER, true );
-            curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true );
-            curl_setopt( $curl, CURLOPT_FOLLOWLOCATION, true );
-//            curl_setopt( $curl, CURLOPT_USERAGENT, get_user_agent_string() );
-            curl_setopt( $curl, CURLOPT_TIMEOUT_MS, 1000 );
-
-            $data = curl_exec( $curl );
-            curl_close( $curl );
-
-            if ( $data ) {
-                $content_length = 'unknown';
-                $status = 'unknown';
-
-                if ( preg_match( '/^HTTP\/1\.[01] (\d\d\d)/', $data, $matches ) ) {
-                    $status = (int) $matches[1];
-                }
-
-                if ( preg_match( '/Content-Length: (\d+)/', $data, $matches ) ) {
-                    $content_length = (int) $matches[1];
-                }
+            $response = wp_remote_get( $url );
+            $content_length = intval(wp_remote_retrieve_header( $response, 'content-length' ));
+            $status = intval(wp_remote_retrieve_response_code( $response));
 
+            if ( $response ) {
                 // http://en.wikipedia.org/wiki/List_of_HTTP_status_codes
                 if ( 200 == $status || ( $status > 300 && $status <= 308 ) ) {
                     $result = $content_length;
diff --git a/includes/wcwuunder-export-html.php b/includes/wcwuunder-export-html.php
deleted file mode 100644
index cf81249..0000000
--- a/includes/wcwuunder-export-html.php
+++ /dev/null
@@ -1,408 +0,0 @@
-<style>
-    .warning {
-        text-align: center;
-        padding-top: 30px;
-    }
-
-    .btn-primary {
-        background: #8dcc00 !important;
-        border-color: #8dcc00 !important;
-        -webkit-box-shadow: 0 1px 0 #8dcc00 !important;
-        box-shadow: 0 1px 0 #8dcc00 !important;
-        color: #fff;
-        text-decoration: none;
-        text-shadow: 0 -1px 1px #8dcc00, 1px 0 1px #8dcc00, 0 1px 1px #8dcc00, -1px 0 1px #8dcc00 !important;
-    }
-
-    a.btn-primary:hover {
-        background: #94d600 !important;
-        border-color: #94d600 !important;
-        -webkit-box-shadow: 0 1px 0 #94d600 !important;
-        box-shadow: 0 1px 0 #94d600 !important;
-        color: #fff;
-        text-decoration: none;
-        text-shadow: 0 -1px 1px #94d600, 1px 0 1px #94d600, 0 1px 1px #94d600, -1px 0 1px #94d600 !important;
-    }
-
-    .submit-wuunder {
-        margin-top: 30px;
-    }
-
-    p {
-        font-size: 11px;
-    }
-</style>
-<script>
-
-    function check_phone() {
-        var phonenumber = jQuery('#wuunderPhonenumber').val();
-        var pattern = new RegExp(/^\+[1-9]{1}[0-9]{10}$/);
-        if (pattern.test(phonenumber)) {
-            jQuery('#wuunderPhonenumber').parent().removeClass('has-error').addClass('has-success');
-        } else {
-            jQuery('#wuunderPhonenumber').parent().removeClass('has-success').addClass('has-error');
-        }
-    }
-
-    jQuery('#wuunderPhonenumber').keyup(function () {
-        check_phone();
-    });
-
-    jQuery(document).ready(function () {
-        check_phone();
-
-        jQuery('.company-address').hide();
-        jQuery('.company-address.address-0').show();
-
-        jQuery('.pickup-address').click(function () {
-            jQuery('.company-address').hide();
-            jQuery('.company-address.address-' + jQuery(this).val()).show();
-        });
-
-        jQuery('.button-wuunder').click(function () {
-            jQuery(".button-wuunder").attr("disabled", true);
-//            jQuery( '.page-form' ).submit();
-            jQuery.post(window.location.href, jQuery('.page-form').serialize(), function (data) {
-                var postData = JSON.parse(data);
-                if (postData.errors.length) {
-                    var html = "<ul>";
-                    for (var error in postData.errors) {
-                        html += "<li>" + postData.errors[error].field + ": " + postData.errors[error].messages.join(", ") + "</li>";
-                    }
-                    jQuery("#alertBox .alert").html(html + "</ul>");
-                    jQuery("#alertBox").show();
-                    jQuery(".button-wuunder").attr("disabled", false);
-                } else if (postData.success) {
-                    window.location.replace(postData.redirect_url);
-                }
-            });
-        });
-        TB_HEIGHT = Math.round(jQuery(window).height() - 20);
-        jQuery(window).resize(function () {
-            TB_HEIGHT = Math.round(jQuery(window).height() - 20);
-        });
-    });
-</script>
-
-<?php
-if (empty($check_company)) { ?>
-    <div class="warning">
-        <img src="<?php echo Woocommerce_Wuunder::$plugin_url . 'assets/images/wuunder_logo.png' ?>"
-             style="padding:20px 30px 20px 20px; width:180px;">
-        <h2>Uw instellingen zijn niet volledig ingevuld</h2>
-        <p>Controleer de gegevens van uw <b>"Standaard afhaaladres"</b>.</p>
-        <a class="btn btn-primary" href="<?php echo admin_url('admin.php?page=wc-settings&tab=wuunder'); ?>">Controleer
-            uw instellingen</a>
-    </div>
-    <?php
-    exit;
-}
-?>
-
-<form method="post" class="page-form">
-    <?php if ('retour' == $_GET['label']) { ?>
-        <h1><img style="width:34px;"
-                 src="<?php echo dirname(plugin_dir_url(__FILE__)) ?>/assets/images/create-icon.png"> Retourlabel
-            aanmaken</h1>
-    <?php } else { ?>
-        <h1><img style="width:34px;"
-                 src="<?php echo dirname(plugin_dir_url(__FILE__)) ?>/assets/images/create-icon.png"> Verzendlabel
-            aanmaken</h1>
-    <?php } ?>
-    <?php
-    $c = true;
-    foreach ($data as $row) :
-        ?>
-        <fieldset>
-            <input type="hidden" name="data[customer_reference]" value="<?php echo $row['orderid']; ?>">
-            <input type="hidden" name="data[value]"
-                   value="<?php echo (0 === $row['waarde'] || empty($row['waarde'])) ? 25 : $row['waarde']; ?>">
-            <input type="hidden" name="data[picture]" value="<?php echo $row['picture'];
-            ?>
-            ">
-            <div id="alertBox" class="row">
-                <div class="col-xs-12">
-                    <div class="alert alert-danger">
-
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-lg-6">
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <div class="row">
-                                <div class="col-sm-4">
-                                    <label style="line-height: 28px; margin-bottom:0;">Ontvanger</label>
-                                </div>
-                                <div class="col-sm-8">
-                                    <?php if ('retour' == $_GET['label']) { ?>
-                                        <select class="pickup-address form-control" id="inputType"
-                                                name="data[pickup_address]">
-                                            <?php foreach ($available_addresses as $pickup_address => $straat) { ?>
-                                                <option
-                                                        value="<?php echo $pickup_address; ?>"><?php echo $straat; ?></option>
-                                            <?php } ?>
-                                        </select>
-                                    <?php } ?>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="panel-body">
-                            <?php if ('retour' == $_GET['label']) { ?>
-                                <?php
-                                foreach ($available_addresses as $pickup_address => $straat) {
-                                    echo '<div class="company-address address-' . $pickup_address . '>';
-                                    if (0 == $pickup_address) {
-                                        // Get Woocommerce Wuunder Settings
-                                        echo get_option('wc_wuunder_company_name') . '<br>';
-                                        echo get_option('wc_wuunder_company_firstname') . ' ' . get_option('wc_wuunder_company_lastname') . '<br>';
-                                        echo get_option('wc_wuunder_company_street') . ' ' . get_option('wc_wuunder_company_housenumber') . '<br>';
-                                        echo get_option('wc_wuunder_company_postode') . ' ' . get_option('wc_wuunder_company_city') . ' ' . get_option('wc_wuunder_company_country') . '<br>';
-                                        echo get_option('wc_wuunder_company_email') . '<br>';
-                                        echo get_option('wc_wuunder_company_phone') . '<br>';
-
-                                    } else {
-                                        echo get_option('wc_wuunder_company_name_' . $pickup_address) . '<br>';
-                                        echo get_option('wc_wuunder_company_firstname_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_lastname_' . $pickup_address) . '<br>';
-                                        echo get_option('wc_wuunder_company_street_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_housenumber_' . $pickup_address) . '<br>';
-                                        echo get_option('wc_wuunder_company_postode_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_city_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_country_' . $pickup_address) . '<br>';
-                                        echo get_option('wc_wuunder_company_email_' . $pickup_address) . '<br>';
-                                        echo get_option('wc_wuunder_company_phone_' . $pickup_address) . '<br>';
-                                    }
-                                    echo '</div>';
-                                }
-                                ?>
-                            <?php } else { ?>
-                                <?php if ('NL' == $row['landcode'] && (empty($row['straat']) || empty($row['huisnummer']))) { ?>
-                                    <span style="color:red">Deze order bevat geen geldige straatnaam- en huisnummergegevens, en kan daarom niet worden ge-exporteerd! Waarschijnlijk is deze order geplaatst voordat de Wuunder plugin werd geactiveerd. De gegevens kunnen wel handmatig worden ingevoerd in het order scherm.</span>
-                                <?php } else { ?>
-                                    <?php echo $row['bedrijfsnaam'] ?><br/>
-                                    t.n.v. <?php echo $row['firstname'] ?><?php echo $row['lastname'] ?><br/>
-                                    <?php echo $row['straat'] ?><?php echo $row['huisnummer'] . $row['huisnummertoevoeging'] ?>
-                                    <br/>
-                                    <?php echo $row['postcode'] ?><?php echo $row['woonplaats'] ?><?php echo $row['landcode']; ?>
-                                    <br/>
-                                    <?php echo $row['email'] ?><br/>
-                                    <?php echo $row['telefoon'] ?><br/>
-                                <?php } ?>
-                            <?php } ?>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-lg-6">
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <div class="row">
-                                <div class="col-sm-4">
-                                    <label style="line-height: 28px; margin-bottom:0;">Verzender</label>
-                                </div>
-                                <div class="col-sm-8">
-                                    <?php if (empty($_GET['label'])) { ?>
-                                        <select class="pickup-address form-control" id="inputType"
-                                                name="data[pickup_address]">
-                                            <?php foreach ($available_addresses as $pickup_address => $straat) { ?>
-                                                <option
-                                                        value="<?php echo $pickup_address; ?>"><?php echo $straat; ?></option>
-                                            <?php } ?>
-                                        </select>
-                                    <?php } ?>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="panel-body">
-                            <?php if ('retour' == $_GET['label']) { ?>
-                                <?php echo $row['bedrijfsnaam'] ?><br/>
-                                t.n.v. <?php echo $row['firstname'] ?><?php echo $row['lastname'] ?><br/>
-                                <?php echo $row['straat'] ?><?php echo $row['huisnummer'] . $row['huisnummertoevoeging'] ?>
-                                <br/>
-                                <?php echo $row['postcode'] ?><?php echo $row['woonplaats'] ?><?php echo $row['landcode']; ?>
-                                <br/>
-                                <?php echo $row['email'] ?><br/>
-                                <?php echo $row['telefoon'] ?><br/>
-                            <?php } else { ?>
-                                <?php
-                                foreach ($available_addresses as $pickup_address => $straat) {
-                                    echo '<div class="company-address address-' . $pickup_address . '">';
-                                    if (0 == $pickup_address) {
-                                        // Get Woocommerce Wuunder Settings
-                                        echo get_option('wc_wuunder_company_name') . '<br>';
-                                        echo get_option('wc_wuunder_company_firstname') . ' ' . get_option('wc_wuunder_company_lastname') . '<br>';
-                                        echo get_option('wc_wuunder_company_street') . ' ' . get_option('wc_wuunder_company_housenumber') . '<br>';
-                                        echo get_option('wc_wuunder_company_postode') . ' ' . get_option('wc_wuunder_company_city') . ' ' . get_option('wc_wuunder_company_country') . '<br>';
-                                        echo get_option('wc_wuunder_company_email') . '<br>';
-                                        echo get_option('wc_wuunder_company_phone') . '<br>';
-
-                                    } else {
-                                        echo get_option('wc_wuunder_company_name_' . $pickup_address) . '<br>';
-                                        echo get_option('wc_wuunder_company_firstname_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_lastname_' . $pickup_address) . '<br>';
-                                        echo get_option('wc_wuunder_company_street_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_housenumber_' . $pickup_address) . '<br>';
-                                        echo get_option('wc_wuunder_company_postode_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_city_' . $pickup_address) . ' ' . get_option('wc_wuunder_company_country_' . $pickup_address) . '<br>';
-                                        echo get_option('wc_wuunder_company_email_' . $pickup_address) . '<br>';
-                                        echo get_option('wc_wuunder_company_phone_' . $pickup_address) . '<br>';
-                                    }
-                                    echo '</div>';
-                                }
-                                ?>
-                            <?php } ?>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="panel panel-default">
-                <div class="panel-heading">Controle mobiele nummer klant</div>
-                <div class="panel-body">
-                    <div class="form-group has-success">
-                        <label class="control-label" for="wuunderPhonenumber">Mobiele nummer <span class="text-primary">*</span>
-                            ( Gebruik de opmaak: +31612345678 )</label>
-                        <input type="text" class="form-control input-sm" name="data[phone_number]"
-                               id="wuunderPhonenumber"
-                               value="<?php echo(0 === (empty($row['telefoon']) || strcmp($row['telefoon'], "+31")) ? "" : $row['telefoon']); ?>"
-                               required="">
-                    </div>
-                </div>
-            </div>
-
-            <div class="panel panel-default">
-                <div class="panel-heading">Bestelling</div>
-                <div class="panel-body">
-                    <table class="table table-striped table-hover">
-                        <thead>
-                        <tr>
-                            <th width="30">#</th>
-                            <th>Product</th>
-                            <th width="100">Gewicht</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <?php
-                        $total_weight = 0;
-                        foreach ($row['bestelling'] as $product) {
-                            $total_weight += $product['total_weight'];
-                            ?>
-                            <tr>
-                                <td><?php echo $product['quantity'] . 'x'; ?></td>
-                                <td><?php echo $product['name'] . $product['variation']; ?></td>
-                                <td><?php echo $product['total_weight']; ?></td>
-                            </tr>
-                            <?php
-                        }
-                        if (0 === $total_weight) {
-                            $total_weight = 5000;
-                        }
-                        ?>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td>&nbsp;</td>
-                            <td>Totaal gewicht</td>
-                            <td><?php echo $total_weight; ?>gr</td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                </div>
-            </div>
-
-            <div class="panel panel-default">
-                <div class="panel-heading">Verzendlabel aanmaken voor #<?php echo $row['ordernr']; ?></div>
-                <div class="panel-body">
-
-                    <div class="form-group">
-                        <label for="inputType" class="control-label">Soort verpakking <span
-                                    class="text-primary">*</span></label>
-                        <select class="form-control input-sm" id="inputType" name="data[kind]">
-                            <option value="package" selected="">Pakket</option>
-                            <option value="document">Document</option>
-                            <option value="pallet"<?php if ($total_weight > 23000) {
-                                echo ' selected';
-                            } ?>>Pallet
-                            </option>
-                        </select>
-                    </div>
-                    <?php
-                    if (0 === strcmp($product['dimensions'], "Niet beschikbaar") || empty($product['dimensions'])) {
-                        $size = array(40, 30, 25);
-                    } else {
-                        $size = explode(' x ', $product['dimensions']);
-                    }
-                    ?>
-                    <div class="form-group">
-                        <label class="control-label" for="wuunderLength">Afmetingen ( l x b x h ) <span
-                                    class="text-primary">*</span></label>
-                        <div class="row">
-                            <div class="col-xs-4">
-                                <div class="input-group">
-                                    <input class="form-control input-sm" name="data[length]" id="wuunderLength"
-                                           type="number" min="1" value="<?php echo $size[0] ?>" required="">
-                                    <div class="input-group-addon input-sm">cm</div>
-                                </div>
-                            </div>
-                            <div class="col-xs-4">
-                                <div class="input-group">
-                                    <input class="form-control input-sm" name="data[width]" id="wuunderWidth"
-                                           type="number" min="1" value="<?php echo $size[1]; ?>" required="">
-                                    <div class="input-group-addon input-sm">cm</div>
-                                </div>
-                            </div>
-                            <div class="col-xs-4">
-                                <div class="input-group">
-                                    <input class="form-control input-sm" name="data[height]" id="wuunderHeight"
-                                           type="number" min="1" value="<?php echo str_replace(' cm', '', $size[2]); ?>"
-                                           required="">
-                                    <div class="input-group-addon input-sm">cm</div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="control-label" for="wuunderWeight">Gewicht <span
-                                    class="text-primary">*</span></label>
-                        <div class="input-group">
-                            <input class="form-control input-sm" name="data[weight]" id="wuunderWeight" type="number"
-                                   value="<?php echo $total_weight; ?>" required="">
-                            <div class="input-group-addon input-sm">gram</div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label class="control-label" for="wuunderReference">Inhoud zending <span
-                                    class="text-primary">*</span></label>
-                        <input class="form-control input-sm" name="data[description]" id="wuunderReference" type="text"
-                               placeholder="Wat is de inhoud van de zending die je gaat versturen?"
-                               value="<?php foreach ($row['bestelling'] as $product) {
-                                   echo $product['name'] . $product['variation'];
-                                   if (next($row['bestelling'])) {
-                                       echo ', ';
-                                   }
-                               } ?>" required="">
-                    </div>
-
-                    <div class="form-group">
-                        <label class="control-label" for="wuunderMessage">Chat bericht</label>
-                        <textarea class="form-control input-sm" name="data[personal_message]" id="wuunderMessage"
-                                  placeholder="Stuur een persoonlijk bericht naar de ontvanger"></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <?php if ('retour' == $_GET['label']) { ?>
-                            <input type="hidden" name="action" value="wcwuunder-retour">
-                            <input type="submit" value="Vraag retourlabel aan"
-                                   class="button-wuunder btn save_order btn-primary tips">
-                        <?php } else { ?>
-                            <input type="hidden" name="action" value="wcwuunder-export">
-                            <input type="submit" value="Vraag verzendlabel aan"
-                                   class="button-wuunder btn save_order btn-primary tips">
-                        <?php } ?>
-                    </div>
-                </div>
-            </div>
-
-            <div id="error-message" class="alert alert-dismissible alert-danger" style="display: none"></div>
-
-        </fieldset>
-    <?php endforeach; ?>
-
-</form>
diff --git a/readme.txt b/readme.txt
index 2d65dc9..cca2b5b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
 === Wuunder Shipping Module ===
-Contributors: @wuunder
+Contributors: wuunder
 Tags: wuunder, shipping, module, woocommerce
 Requires at least: 4.6
 Tested up to: 4.7
diff --git a/woocommerce-wuunder.php b/woocommerce-wuunder.php
index dee55d7..96d8063 100644
--- a/woocommerce-wuunder.php
+++ b/woocommerce-wuunder.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Plugin Name: WooCommerce Wuunder
+ * Plugin Name: Wuunder for-woocommerce
  * Plugin URI: https://wearewuunder.com/wuunder-voor-webshops/
  * Description: Wuunder shipping plugin
- * Version: 2.7.7
+ * Version: 2.7.8
  * Author: Wuunder
  * Author URI: http://wearewuunder.com
  */
@@ -57,7 +57,7 @@ class Woocommerce_Wuunder {
         public static $plugin_path;
         public static $plugin_basename;
 
-        const VERSION = '2.7.7';
+        const VERSION = '2.7.8';
 
         public function __construct() {
 
@@ -95,16 +95,18 @@ public function wcwp_load_textdomain() {
         }
 
         public function wcwp_webhook() {
-            wcwp_log( 'info', 'Test webhook' );
-            wcwp_log( 'info', $_REQUEST['order'] );
-            wcwp_log( 'info', $_REQUEST['token'] );
-
             if ( !isset($_REQUEST['order'] ) || !isset( $_REQUEST['token'] ) ) {
                 wp_redirect( '', 500 );
                 return;
             }
-            $orderId = $_REQUEST['order'];
-            $bookingToken = $_REQUEST['token'];
+            $orderId = sanitize_text_field($_REQUEST['order']);
+            $bookingToken = sanitize_text_field($_REQUEST['token']);
+
+            wcwp_log( 'info', 'Test webhook' );
+            wcwp_log( 'info', $orderId );
+            wcwp_log( 'info', $bookingToken );
+
+
             $data = json_decode(file_get_contents( 'php://input' ), true );
             $errorRedirect = true;