diff --git a/.gitignore b/.gitignore
index ca5166b..d20a3fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ release.sh
 /.d*
 design/custom/*
 design_cpl/*
+.esniper/
 
 **/css/bootstrap*.css
 **/js/bootstrap*.js
diff --git a/.version b/.version
index 3e1ad72..ce6a70b 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.5.0
\ No newline at end of file
+1.6.0
\ No newline at end of file
diff --git a/HOOKS.md b/HOOKS.md
index 2e9504f..707944f 100644
--- a/HOOKS.md
+++ b/HOOKS.md
@@ -2,28 +2,23 @@
 
 Some hooks have a **parameter by reference**.
 
-Please refer to source code for context.
-
-## index.php
-
-    Line   28 : Hook::apply('init')
-    Line   58 : Hook::apply('config.loaded', $config)
-    Line   77 : Hook::apply('before.action', $page)
-    Line   93 : Hook::apply('template.compile', $html)
-    Line  114 : Hook::apply('template.compiled', $html)
-    Line  121 : Hook::apply('template.compressed', $html)
-    Line  128 : Hook::apply('before.render')
-    Line  133 : Hook::apply('after.render')
-
-## app/mef/Snipe.php
-
-    Line   92 : Hook::apply('snipe.loaded', $this)
-    Line  115 : Hook::apply('snipe.loaded', $this)
-
-## design/default/index.html
-
-    Line   36 : Hook::apply('head.style')
-    Line   37 : Hook::apply('head.script')
-    Line   43 : Hook::apply('before.content')
-    Line   61 : Hook::apply('after.content')
-    Line   66 : Hook::apply('body.script')
+Please refer to the source code to find out more about the context of the hook.
+
+    +--------------------------------+------+-----------------------------------------------+
+    | File                           | Line | Hook call                                     |
+    +--------------------------------+------+-----------------------------------------------+
+    | index.php                      |   27 | Hook::apply('init')                           |
+    | index.php                      |   58 | Hook::apply('config.loaded', $config)         |
+    | index.php                      |   78 | Hook::apply('before.action', $page)           |
+    | index.php                      |   96 | Hook::apply('template.compile', $html)        |
+    | index.php                      |  117 | Hook::apply('template.compiled', $html)       |
+    | index.php                      |  124 | Hook::apply('template.compressed', $html)     |
+    | index.php                      |  131 | Hook::apply('before.render')                  |
+    | index.php                      |  136 | Hook::apply('after.render')                   |
+    | app/mef/Snipe.php              |   98 | Hook::apply('snipe.loaded', $this)            |
+    | app/mef/Snipe.php              |  121 | Hook::apply('snipe.loaded', $this)            |
+    | design/default/index.html      |   36 | Hook::apply('head.style')                     |
+    | design/default/index.html      |   43 | Hook::apply('before.content')                 |
+    | design/default/index.html      |   62 | Hook::apply('after.content')                  |
+    | design/default/index.html      |   69 | Hook::apply('body.script')                    |
+    +--------------------------------+------+-----------------------------------------------+
diff --git a/README.md b/README.md
index 6450f48..b509d83 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # A minimal esniper web frontend
 
+![](https://img.shields.io/github/release/K-Ko/MiniEsniperWebFrontend.svg)
+
 This repo will cover the handling of [esniper](http://esniper.sourceforge.net/),  a lightweight eBay sniping tool.
 
 It works directly with the files created by esniper.
diff --git a/api.php b/api.php
index 51eb84b..675a44e 100644
--- a/api.php
+++ b/api.php
@@ -21,7 +21,7 @@
 
 $result = '';
 
-if ($snipe = $snipes->find($GET['token'])) {
+if (isset($snipes) && $snipe = $snipes->find($GET['token'])) {
     switch ($GET['api']) {
         // ---------------
         case 'edit':
@@ -54,7 +54,8 @@
         [
             'bug'  => FILTER_SANITIZE_STRING,
             'name' => FILTER_SANITIZE_STRING,
-            'item' => FILTER_SANITIZE_STRING
+            'item' => FILTER_SANITIZE_STRING,
+            'ship' => FILTER_SANITIZE_STRING
         ],
         true
     ));
@@ -74,15 +75,21 @@
             // Need user for snipe instance to have a data path
             mef\User::init($GET['token'], null);
 
+            $name = urldecode($GET['name']);
+            // Ebay uses " as quotes in auction names
+            $name = str_replace('"', '"', $name);
+
             // Trim auction title title to max. 40 chars, don't split words
-            $name = substr($GET['name'], 0, 40);
-            while (strlen($name) && substr($name, -1) != ' ') {
-                $name = substr($name, 0, -1);
-            }
+            // $name = substr($name, 0, 40);
+            // while (strlen($name) && substr($name, -1) != ' ') {
+            //     $name = substr($name, 0, -1);
+            // }
 
             $snipe = new mef\Snipe(
                 trim($name),
-                '# Define your price #' . PHP_EOL . $GET['item']
+                '# Shipping: ' . urldecode($GET['ship']) . PHP_EOL .
+                '# Adjust your price!' . PHP_EOL .
+                $GET['item'] . ' 1.00'
             );
 
             $result = $snipe->save()
diff --git a/app/console b/app/console.php
similarity index 95%
rename from app/console
rename to app/console.php
index bc49920..57b46e2 100755
--- a/app/console
+++ b/app/console.php
@@ -12,8 +12,8 @@ function usage($rc = 0)
     global $argv;
 
     echo PHP_EOL;
-    echo 'Minimal esniper web frontend v', trim(file_get_contents('.version')), PHP_EOL, PHP_EOL;
-    echo "Usage: $argv[0] <command> [command options]", PHP_EOL, PHP_EOL;
+    echo 'Minimal esniper web frontend console v', trim(file_get_contents('.version')), PHP_EOL, PHP_EOL;
+    echo "Usage: $argv[0] <command> [options]", PHP_EOL, PHP_EOL;
     echo "       $argv[0] start <ebay user name> <password>          Start missing esniper processes", PHP_EOL;
     echo "       $argv[0] start <ebay user name> <password> <group>  Start esniper for group", PHP_EOL;
     echo "       $argv[0] restart <ebay user name> <password>        Restart all esniper processes", PHP_EOL;
diff --git a/app/mef/Config.php b/app/mef/Config.php
index cf79afd..0333de8 100644
--- a/app/mef/Config.php
+++ b/app/mef/Config.php
@@ -62,7 +62,7 @@ public function get($name, $default = null)
      *
      * @param string $name
      * @param mixed $value
-     * @return Instance
+     * @return Instance $this for fluid interface
      */
     public function set($name, $value)
     {
diff --git a/app/mef/Snipe.php b/app/mef/Snipe.php
index 4d3aa77..768d4c2 100644
--- a/app/mef/Snipe.php
+++ b/app/mef/Snipe.php
@@ -27,6 +27,13 @@ class Snipe
      */
     public $data;
 
+    /**
+     * End time(s)
+     *
+     * @var string
+     */
+    public $end;
+
     /**
      * esniper log
      *
@@ -130,7 +137,7 @@ public function save()
                 sprintf(
                     'name = "%2$s"%1$s%1$sdata = "%3$s%1$s"%1$s',
                     PHP_EOL,
-                    $this->name,
+                    str_replace('"', '\\"', $this->name),
                     trim($this->data)
                 )
             );
@@ -324,6 +331,7 @@ protected function reset()
     {
         $this->name  = '';
         $this->data  = '';
+        $this->end   = '';
         $this->log   = '';
         $this->won   = false;
         $this->pid   = 0;
@@ -354,6 +362,27 @@ protected function getLog()
                 }
             }
 
+            // Get auction end time
+            if (preg_match_all('~End time: *(.*)$~m', $log, $args)) {
+                // Get last end time from log
+                $ts = strptime(array_pop($args[1]), '%d/%m/%Y %H:%M:%S');
+
+                // Make timestamp for reformating
+                $ts = mktime(
+                    $ts['tm_hour'],
+                    $ts['tm_min'],
+                    $ts['tm_sec'],
+                    $ts['tm_mon'] + 1,
+                    $ts['tm_mday'],
+                    $ts['tm_year'] + 1900
+                );
+
+                // Not ended auction?
+                if ($ts > time()) {
+                    $this->end = date(I18N::_('timestamp_format'), $ts);
+                }
+            }
+
             return $log;
         }
     }
diff --git a/config.default.php b/config.default.php
index 771037f..13282ec 100644
--- a/config.default.php
+++ b/config.default.php
@@ -67,10 +67,5 @@
     /**
      * Inital language
      */
-    'language' => 'en',
-
-    /**
-     * Only for development
-     */
-    'debug' => false,
+    'language' => 'en'
 ];
diff --git a/design/default/css/style.css b/design/default/css/style.css
index cbc0a32..637023a 100644
--- a/design/default/css/style.css
+++ b/design/default/css/style.css
@@ -17,7 +17,8 @@ form {
     display: inline;
 }
 
-a, .btn-link {
+a,
+.btn-link {
     text-decoration: none !important;
     color: maroon;
 }
@@ -41,8 +42,8 @@ a, .btn-link {
 }
 
 textarea,
-input[type=text] {
-    padding: .25em .5em;
+input[type='text'] {
+    padding: 0.25em 0.5em;
 }
 
 .pre {
diff --git a/design/default/home.html b/design/default/home.html
index 1f8319b..9575d74 100644
--- a/design/default/home.html
+++ b/design/default/home.html
@@ -1,12 +1,14 @@
 <div class="row header">
     <div class="col-3 col-sm-2">
-        <a id="toggle-form" href="#" class="btn btn-light fa fa-plus-circle fa-2x" rel="tooltip" title="{|toggle_form|}"></a>
+        <a id="toggle-form" href="#" class="btn btn-light fa fa-plus-circle fa-2x"
+           rel="tooltip" title="{|toggle_form|}"></a>
     </div>
     <div class="col text-center user">
         <span class="d-sm-none">{{echo mef\User::$name}}</span>
         <span class="d-none d-sm-inline h2">{{echo mef\User::$name}}</span>
         <form method="post">
-            <button type="submit" class="btn btn-light" rel="tooltip" title="{|logout|}" name="action" value="logout">
+            <button type="submit" class="btn btn-light" rel="tooltip" title="{|logout|}"
+                    name="action" value="logout">
                 <i class="fa fa-sign-out-alt"></i>
             </button>
         </form>
@@ -18,7 +20,7 @@
 
 <!-- Add auctions form start, show if no sniping group is defined yet -->
 <form method="post" accept-charset="utf-8">
-    <input type="hidden" name="name_old" value="{{if (isset($snipe)) echo $snipe->name}}">
+    <input id="name_old" type="hidden" name="name_old" value="{{if (isset($snipe)) echo $snipe->name}}">
 
     <div id="add-form" class="row {{if (count($snipes) && !isset($snipe)) echo 'd-none'}}">
         <div class="col">
@@ -29,7 +31,8 @@
                     <small class="form-text text-muted d-sm-none mb-1">{|group_hint|}</small>
                 </div>
                 <div class="col">
-                    <input type="text" id="name" class="form-control" name="name" required>
+                    <input type="text" id="name" class="form-control" name="name"
+                           required>
                     <small class="form-text text-muted d-none d-sm-block">{|group_hint|}</small>
                 </div>
             </div>
@@ -43,7 +46,8 @@
                     </small>
                 </div>
                 <div class="col">
-                    <textarea id="data" class="form-control" style="height:5rem" name="data" required></textarea>
+                    <textarea id="data" class="form-control" style="height:5rem"
+                              name="data" required></textarea>
                     <small class="form-text text-muted d-none d-sm-block">{|auction_hint|}</small>
                 </div>
             </div>
@@ -53,10 +57,12 @@
                 <div class="col">
                     <div class="row">
                         <div class="col">
-                            <button class="btn btn-primary btn-block" name="action" value="start">{|start|}</button>
+                            <button class="btn btn-primary btn-block" name="action"
+                                    value="start">{|start|}</button>
                         </div>
                         <div class="col">
-                            <button class="btn btn-secondary btn-block" name="action" value="save">{|save|}</button>
+                            <button class="btn btn-secondary btn-block" name="action"
+                                    value="save">{|save|}</button>
                         </div>
                     </div>
                 </div>
@@ -72,30 +78,37 @@
     {{foreach ($snipes as $snipe): $token = $snipe->getNameHash()}}
     <div class="row py-2 table-bordered table-{{echo $snipe->pid ? 'success' : 'secondary'}}">
         <div class="col">
-            <strong class="pointer" rel="tooltip" title="{|show_log|}" data-toggle="log" data-token="{{$token}}" style="font-size:1.2rem">{{$snipe->name}}</strong>
-            {{if ($snipe->won):}}
-            <div class="badge badge-pill badge-success text-monospace ml-3" rel="tooltip" title="{|won|}">
+            <strong class="pointer" rel="tooltip" title="{|show_log|}"
+                    data-toggle="log" data-token="{{$token}}" style="font-size:1.2rem">{{$snipe->name}}</strong>
+            {{if ($snipe->end):}}
+            <br>
+            <small>{{$snipe->end}}</small>
+            {{elseif ($snipe->won):}}
+            <div class="badge badge-pill badge-success text-monospace ml-3" rel="tooltip"
+                 title="{|won|}">
                 <i class="fa fa-fw fa-shopping-bag pr-2"></i> {{$snipe->won}}
             </div>
             {{endif}}
         </div>
-        <div class="col-4 col-sm-3 text-right">
+        <div class="col-auto text-right pr-2">
             <!-- Action buttons -->
             <form method="post">
                 <input type="hidden" name="name" value="{{$snipe->name}}">
 
-                <a href="#" data-api="edit" data-token="{{$token}}" class="btn btn-sm btn-primary" rel="tooltip" title="{|edit_group|}" value="edit">
+                <a href="#" data-api="edit" data-token="{{$token}}" class="btn btn-sm btn-primary mr-2"
+                   rel="tooltip" title="{|edit_group|}" value="edit">
                     <i class="far fa-fw fa-edit"></i>
                 </a>
-
                 <!-- esniper process IS running -->
-                <button class="btn btn-sm btn-danger btn-stop {{if (!$snipe->pid):}}d-none{{endif}}" name="action" data-api="stop" data-token="{{$token}}"
-                    rel="tooltip" title="{|stop_snipe|}" value="stop">
+                <button class="btn btn-sm btn-danger btn-stop {{if (!$snipe->pid):}}d-none{{endif}}"
+                        name="action" data-api="stop" data-token="{{$token}}"
+                        rel="tooltip" title="{|stop_snipe|}" value="stop">
                     <i class="fas fa-fw fa-stop"></i>
                 </button>
                 <!-- esniper process IS NOT running -->
-                <button class="btn btn-sm btn-warning btn-delete {{if ($snipe->pid):}}d-none{{endif}}" name="action" data-api="delete" data-token="{{$token}}"
-                    rel="tooltip" title="{|remove_group|}" value="delete">
+                <button class="btn btn-sm btn-warning btn-delete {{if ($snipe->pid):}}d-none{{endif}}"
+                        name="action" data-api="delete" data-token="{{$token}}"
+                        rel="tooltip" title="{|remove_group|}" value="delete">
                     <i class="fas fa-fw fa-trash"></i>
                 </button>
 
@@ -105,7 +118,9 @@
     <div id="log-{{$token}}" class="row log d-none">
         <div class="col p-0">
             <!-- esniper prtocol file -->
-            <div class="pre p-2 mb-0" tabindex="-1">{{if ($snipe->log):}}{{$snipe->log}}{{else:}}No auction log{{endif}}</div>
+            <div class="pre p-2 mb-0" tabindex="-1">
+                {{if ($snipe->log):}}{{$snipe->log}}{{else:}}No auction
+                log{{endif}}</div>
         </div>
     </div>
     {{endforeach}}
@@ -121,16 +136,21 @@
 
             {{foreach ($bugs as $bug):}}
             <div class="form-check">
-                <input type="checkbox" class="form-check-input" name="bugs[]" value="{{$bug}}"> &nbsp;
-                <a class="form-check-label" href="?api=bug&amp;bug={{$bug}}" rel="tooltip" title="Show esniper bug report" target="_blank">
+                <input type="checkbox" class="form-check-input" name="bugs[]"
+                       value="{{$bug}}">
+                &nbsp;
+                <a class="form-check-label" href="?api=bug&amp;bug={{$bug}}"
+                   rel="tooltip" title="Show esniper bug report" target="_blank">
                     <i class="fa fa-fw fa-external-link-alt mr-1"></i>
                     {{$bug}}
                 </a>
             </div>
             {{endforeach}}
 
-            <button type="submit" class="btn btn-primary mt-3" name="action" value="bug">
-                <i class="fas fa-fw fa-trash"></i> &nbsp; Delete esniper bug report(s)
+            <button type="submit" class="btn btn-primary mt-3" name="action"
+                    value="bug">
+                <i class="fas fa-fw fa-trash"></i> &nbsp; Delete esniper bug
+                report(s)
             </button>
 
         </form>
@@ -146,11 +166,14 @@
     </div>
     <div class="row">
         <div class="col">
-            <img src="favicon.ico" class="mr-1" style="height:1rem;vertical-align:text-top;"> Minimal esniper web frontend
+            <img src="favicon.ico" class="mr-1" style="height:1rem;vertical-align:text-top;">
+            Minimal esniper web frontend
             <br>
             <small>
-                <strong class="text-monospace">v{{$config->version}}</strong>, check on
-                <a href="https://github.com/K-Ko/MiniEsniperWebFrontend" class="mx-1" target="_blank">
+                <strong class="text-monospace">v{{$config->version}}</strong>,
+                check on
+                <a href="https://github.com/K-Ko/MiniEsniperWebFrontend" class="mx-1"
+                   target="_blank">
                     <i class="fab fa-github"></i> GitHub
                 </a>
                 for updates
@@ -158,8 +181,37 @@
         </div>
         <div class="col text-right">
             <a href="http://esniper.sourceforge.net/" target="_blank">
-                <i class="fa fa-external-link-alt"></i> {{$config->esniper_version}}
+                <i class="fa fa-external-link-alt"></i>
+                {{$config->esniper_version}}
             </a>
+            <br>
+            <a href="javascript:(
+            function() {
+                var w = window, d = document,
+                    s = d.getElementById('descItemNumber').innerText || w.getSelection().toString(),
+                    f = d.getElementById('fshippingCost').getElementsByTagName('span')[0].innerHTML;
+                if (s) {
+                    var e = encodeURIComponent,
+                        p = w.open('http://{{$server_name}}?api=bookmark&token={{$user_name}}' +
+                                   '&name=' + e(d.title.replace(/\s*\|.*/, '')) +
+                                   '&item=' + e(s) +
+                                   '&ship=' + e(f),
+                                   'es_popup',
+                                   'left=' + ((w.screenX || w.screenLeft) + 25) + ',' +
+                                   'top=' + ((w.screenY || w.screenTop) + 25) + ',' +
+                                   'height=120px,' +
+                                   'width=480px,' +
+                                   'menubar=0,' +
+                                   'resizable=0,' +
+                                   'status=0,' +
+                                   'location=0,' +
+                                   'alwaysRaised=1' );
+                    w.setTimeout(function() { p.focus(); }, 300);
+                } else {
+                    w.alert('Please select item Id before!');
+                }
+            })();"
+               class="small" rel="tooltip" title="{|bookmarklet_hint|}">{|bookmarklet|}</a>
         </div>
     </div>
 </footer>
diff --git a/design/default/index.html b/design/default/index.html
index b769ea9..fa31d9f 100644
--- a/design/default/index.html
+++ b/design/default/index.html
@@ -29,24 +29,26 @@
     <title>{{$config->title}}</title>
 
     <link rel="stylesheet" href="/design/default/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.10/css/all.css" integrity="sha384-+d0P83n9kaQMCwj8F4RJB66tzIwOKmrdb46+porD/OvrJ+37WqIM7UoBtwHO6Nlg"
-        crossorigin="anonymous">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.10/css/all.css"
+          integrity="sha384-+d0P83n9kaQMCwj8F4RJB66tzIwOKmrdb46+porD/OvrJ+37WqIM7UoBtwHO6Nlg"
+          crossorigin="anonymous">
     <link rel="stylesheet" href="/design/default/css/style.css">
 
     <style>{{echo mef\Hook::apply('head.style')}}</style>
-    <script>{{echo mef\Hook::apply('head.script')}}</script>
+    <script>{{ echo mef\Hook:: apply('head.script') }}</script>
 </head>
 
 <body>
 
-    <div class="container mt-3">
+    <div class="container loading mt-3">
         {{echo mef\Hook::apply('before.content')}}
 
         {{if (isset($_SESSION['message'])):}}
         <div class="row mt-3">
             <div class="col">
                 <div class="alert alert-{{$_SESSION['message']['class']}}" role="alert">
-                    <button type="button" class="close" data-dismiss="alert" aria-label="close">
+                    <button type="button" class="close" data-dismiss="alert"
+                            aria-label="close">
                         <span aria-hidden="true">&times;</span>
                     </button>
                     {{$_SESSION['message']['text']}}
@@ -63,7 +65,9 @@
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
     <script src="/design/default/js/bootstrap.bundle.min.js"></script>
-    <script src="design/default/js/script.js"></script> {{echo mef\Hook::apply('body.script')}}
+    <script src="/design/default/js/pageVisible.js"></script>
+    <script src="/design/default/js/script.js"></script> {{echo
+    mef\Hook::apply('body.script')}}
 
 </body>
 
diff --git a/design/default/js/pageVisible.js b/design/default/js/pageVisible.js
new file mode 100644
index 0000000..6b7b43e
--- /dev/null
+++ b/design/default/js/pageVisible.js
@@ -0,0 +1,126 @@
+/**
+ * Based on
+ * http://www.sitepoint.com/introduction-to-page-visibility-api/
+ */
+var pageVisibilityApi = (function() {
+    /**
+     * Private variables & methods
+     */
+    var options = {
+            onShow: null,
+            onHide: null,
+            delay: 0, // Seconds
+            debug: false
+        },
+        browserPrefix = null,
+        timeoutId = false;
+
+    /**
+     *
+     */
+    function log(msg) {
+        options.debug && console.log('Page visibility API: ' + msg);
+    }
+
+    /**
+     *
+     */
+    function isVisible() {
+        return document.hidden === false || document[browserPrefix + 'Hidden'] === false;
+    }
+
+    /**
+     * State change listener
+     */
+    function onStateChange() {
+        if (isVisible()) {
+            log('Page become visible');
+            if (options.onShow) {
+                timeoutId = setTimeout(options.onShow, options.delay * 1000);
+            }
+        } else {
+            log('Page become hidden');
+            if (timeoutId) {
+                log('Clear timeout');
+                clearTimeout(timeoutId);
+            }
+            if (options.onHide) {
+                options.onHide();
+            }
+        }
+    }
+
+    /**
+     * Public interface
+     */
+    return {
+        /**
+         *
+         */
+        Init: function(opts) {
+            $.extend(options, opts);
+
+            if (document.hidden !== undefined) {
+                browserPrefix = '';
+            } else {
+                var browserPrefixes = ['webkit', 'moz', 'ms', 'o'];
+                // Test all vendor prefixes
+                for (var i = 0; i < browserPrefixes.length; i++) {
+                    if (document[browserPrefixes[i] + 'Hidden'] != undefined) {
+                        browserPrefix = browserPrefixes[i];
+                        break;
+                    }
+                }
+            }
+
+            if (browserPrefix !== null) {
+                let evListener = browserPrefix + 'visibilitychange';
+                log('Add addEventListener "' + evListener + '"');
+                document.addEventListener(evListener, onStateChange);
+            } else {
+                log('Not available');
+            }
+        },
+
+        /**
+         *
+         * @return boolean
+         */
+        isVisible: function() {
+            return isVisible();
+        },
+
+        /**
+         *
+         * @param {integer} delay Seconds
+         */
+        setDelay: function(delay) {
+            options.delay = +delay;
+        },
+
+        /**
+         *
+         * @param {boolean} debug
+         */
+        setDebug: function(debug) {
+            options.debug = !!debug;
+        },
+
+        /**
+         * https://stackoverflow.com/a/7356528
+         *
+         * @param {callable} callback
+         */
+        setOnShow: function(callback) {
+            options.onShow = callback || null;
+        },
+
+        /**
+         *
+         * @param {callable} callback
+         */
+        setOnHide: function(callback) {
+            options.onHide = callback || null;
+        }
+    };
+})();
diff --git a/design/default/js/script.js b/design/default/js/script.js
index 8b77b2a..edbee4c 100644
--- a/design/default/js/script.js
+++ b/design/default/js/script.js
@@ -28,10 +28,13 @@ jQuery.fn.extend({
  * On load
  */
 $(function() {
-    $('[rel="tooltip"]').tooltip();
+    $('.container').removeClass('loading');
+
     $('#data').autoHeight();
 
-    $('#toggle-form').on('click', function(e) {
+    $('[rel="tooltip"]').tooltip();
+
+    $('#toggle-form').click(function(e) {
         e.preventDefault();
 
         var edit = $('#add-form');
@@ -52,7 +55,7 @@ $(function() {
             .toggleClass('fa-minus-circle');
     });
 
-    $('[data-toggle=log]').on('click', function(e) {
+    $('[data-toggle=log]').click(function(e) {
         e.preventDefault();
 
         var el = $('#log-' + $(this).data('token'));
@@ -76,12 +79,10 @@ $(function() {
         }
     });
 
-    $('[data-api=edit]').on('click', function(e) {
+    $('[data-api=edit]').click(function(e) {
         e.preventDefault();
 
-        var el_form = $('#add-form'),
-            el_name = $('#name'),
-            el_data = $('#data');
+        var el_form = $('#add-form');
 
         // Hide all logs
         $('.log').addClass('d-none');
@@ -96,9 +97,9 @@ $(function() {
         $.getJSON('/', { api: 'edit', token: $(this).data('token') }, function(
             data
         ) {
-            el_name.prop('value', data.name);
-            el_data
-                .text(data.data)
+            $('#name, #name_old').prop('value', data.name);
+            $('#data')
+                .html(data.data)
                 .trigger('input')
                 .focus();
         }).always(function() {
@@ -106,7 +107,7 @@ $(function() {
         });
     });
 
-    $('[data-api=stop]').on('click', function(e) {
+    $('[data-api=stop]').click(function(e) {
         e.preventDefault();
 
         var $this = $(this),
@@ -129,7 +130,7 @@ $(function() {
         });
     });
 
-    $('[data-api=delete]').on('click', function(e) {
+    $('[data-api=delete]').click(function(e) {
         e.preventDefault();
 
         var $this = $(this),
@@ -139,18 +140,21 @@ $(function() {
             if (data) {
                 $this.closest('.row').remove();
                 $('#log-' + token).remove();
+                $('#add-form').addClass('d-none');
+                $('#toggle-form')
+                    .removeClass('fa-minus-circle')
+                    .addClass('fa-plus-circle');
             }
         });
     });
 
-    $('#example').on('click', function(e) {
+    $('#example').click(function(e) {
         e.preventDefault();
 
         $.get('/app/example.txt', function(data) {
             var el = $('#data'),
                 text = el.text() + '\n';
-            el
-                .text((text + data).trim())
+            el.text((text + data).trim())
                 .trigger('input')
                 .focus();
         });
@@ -170,4 +174,12 @@ $(function() {
                 $(this).remove();
             });
     }, 5000);
+
+    // Reload page on activate
+    pageVisibilityApi.Init({
+        onShow: function() {
+            location.href = '/';
+        },
+        delay: 1
+    });
 });
diff --git a/ec b/ec
new file mode 100755
index 0000000..3cf37bc
--- /dev/null
+++ b/ec
@@ -0,0 +1,4 @@
+#!/usr/bin/env php
+<?php
+
+require __DIR__ . '/app/console.php';
diff --git a/esniper-git.sh b/esniper-git.sh
new file mode 100755
index 0000000..dd8a838
--- /dev/null
+++ b/esniper-git.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+##set -x
+
+dir=$(dirname $0)/.esniper
+
+if [ ! -d $dir ]; then
+    echo -e ':::\n::: clone ...\n:::'
+    # Clone esniper
+    git clone https://git.code.sf.net/p/esniper/git $dir
+    cd $dir
+else
+    echo -e ':::\n::: pull ...\n:::'
+    cd $dir
+    # Reset patched files
+    git checkout -- .
+    # Pull changes
+    git pull origin master
+fi
+
+# Patch min. bid time to 1 sec. and default bid time to 7 sec.
+sed -i 's/#define MIN_BIDTIME.*$/#define MIN_BIDTIME 1/;
+        s/#define DEFAULT_BIDTIME.*$/#define DEFAULT_BIDTIME 7/' esniper.c
+
+echo -e ':::\n::: configure, make, strip ...\n:::'
+autoreconf -i && ./configure && make
+
+[ $? == 0 ] || exit
+
+echo -e ':::\n::: "make install" will require root privileges via sudo!\n:::'
+strip esniper && sudo make install && make clean
+
+if [ $? == 0 ]; then
+    echo '----------------------------------------------------------------------------'
+    esniper -v
+fi
+
+set +x
diff --git a/index.php b/index.php
index 508f812..b3f7910 100644
--- a/index.php
+++ b/index.php
@@ -30,13 +30,14 @@
 // Load default config and custom config if exists
 $config = Config::getInstance()->load('config.default.php')->load('config.local.php');
 
+// Must be set via config.local.php
 if ($config->debug) {
     ini_set('display_errors', 1);
     error_reporting(-1);
 }
 
 if ($config->esniper == '') {
-    die('Can not find esniper binary, please help and define in <pre>config.php</pre>');
+    die('Can not find esniper binary, please help and define in <pre>config.local.php</pre>');
 }
 
 $config->version = trim(file_get_contents('.version'));
@@ -63,6 +64,7 @@
     $page = 'home';
 
     User::init($_SESSION['user'], $_SESSION['pass']);
+    $user_name=User::$name;
 
     // Load all auction groups
     $snipes = new Snipes();
@@ -82,6 +84,8 @@
 // Check for form submits
 include 'post.php';
 
+$server_name = $_SERVER['SERVER_NAME'];
+
 foreach (['index', $page] as $tpl) {
     $cpl = 'design_cpl/' . $config->design . '.' . $tpl . '.html';
     $tpl = 'design/' . $config->design . '/' . $tpl . '.html';
@@ -99,7 +103,7 @@
             }
         }
         // Coding - {{if (true):}}
-        if (preg_match_all('~\{\{(.+?)\}\}~', $html, $matches, PREG_SET_ORDER)) {
+        if (preg_match_all('~\{\{(.+?)\}\}~s', $html, $matches, PREG_SET_ORDER)) {
             foreach ($matches as $match) {
                 $html = str_replace($match[0], '<?php '.$match[1].' ?'.'>', $html);
             }
@@ -114,8 +118,8 @@
         Hook::apply('template.compiled', $html);
 
         if (!$config->debug) {
-            $html = preg_replace('~/\*.+?\*/~s', '', $html);
             $html = preg_replace('~\s*$\s*~m', '', $html);
+            $html = preg_replace('~/\*.+?\*/~s', ' ', $html);
             $html = str_replace(['<?php', '?'.'>'], ['<?php ', ' ?'.'>'], $html);
 
             Hook::apply('template.compressed', $html);
diff --git a/language/de.php b/language/de.php
index 6dd5ae9..d6be826 100644
--- a/language/de.php
+++ b/language/de.php
@@ -8,6 +8,8 @@
  */
 return [
 
+    'timestamp_format'  => 'd.m.Y H:i:s',
+
     'ebay_user'         => 'E-Mail-Adresse oder Nutzername',
     'ebay_pass'         => 'Passwort',
     'language'          => 'Sprache',
@@ -43,4 +45,7 @@
     'stop_snipe'        => 'Stoppe aktiven esniper',
     'remove_group'      => 'Auktionsgruppe und Logdatei löschen',
 
+    'bookmarklet'       => 'Zu esniper hinzufügen',
+    'bookmarklet_hint'  => 'Ziehe diesen Link auf Deine Lesezeichen',
+
 ];
diff --git a/language/en.php b/language/en.php
index 397aa40..154e8d2 100644
--- a/language/en.php
+++ b/language/en.php
@@ -8,6 +8,8 @@
  */
 return [
 
+    'timestamp_format'  => 'Y-m-d H:i:s',
+
     'ebay_user'         => 'Email or username',
     'ebay_pass'         => 'Password',
     'language'          => 'Language',
@@ -43,4 +45,7 @@
     'stop_snipe'        => 'Stop active esniper',
     'remove_group'      => 'Remove sniping group &amp; log',
 
+    'bookmarklet'       => 'Add to esniper',
+    'bookmarklet_hint'  => 'Drag this link to your bookmarks',
+
 ];