diff --git a/.gitignore b/.gitignore
index 3eee248..0e85901 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+*.pyc
 dpaste/settings_local.py
 dpaste.egg-info
diff --git a/README.md b/README.md
index f64f2d1..5ff869b 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ dpaste
 dpaste is a Django based pastebin. It's intended to run separatly or installed
 into an existing Django project.
 
-You can find a live example on http://www.dpaste.de/
+You can find a live example on http://dpaste.de/
 
 
 Testing
@@ -16,5 +16,5 @@ Testing
 ```
 $ pip install -r requirements.txt
 $ pip install -e .
-$ manage.py test dpaste 
+$ manage.py test dpaste
 ```
diff --git a/dpaste/templates/dpaste/about.html b/dpaste/templates/dpaste/about.html
index 4a22b30..5b011df 100644
--- a/dpaste/templates/dpaste/about.html
+++ b/dpaste/templates/dpaste/about.html
@@ -47,16 +47,16 @@
         {% endfor %}
     </table>
 
-    <div class="clearfix"/>
-    <hr class="clearfix"/>
+    <div class="clearfix"></div>
+    <hr class="clearfix">
 
     <h3>Imprint</h3>
 
     <p><strong>Address:</strong></p>
     <p>
-        Martin Mahner<br/>
-        Lauterbacher Str. 4<br/>
-        DE-18581 Putbus<br/>
+        Martin Mahner<br>
+        Lauterbacher Str. 4<br>
+        DE-18581 Putbus<br>
         Germany
     </p>
 
diff --git a/dpaste/templates/dpaste/base.html b/dpaste/templates/dpaste/base.html
index c85fd74..f6b8a62 100644
--- a/dpaste/templates/dpaste/base.html
+++ b/dpaste/templates/dpaste/base.html
@@ -2,8 +2,8 @@
 <html>
 <head>
     <title>dpaste.de: {% block title %}{% trans "New snippet" %}{% endblock %}</title>
-    <link href="{% static "dpaste/bootstrap/css/bootstrap.min.css" %}" rel="stylesheet" media="screen">
-    <link href="{% static "dpaste/theme.css" %}" rel="stylesheet" media="screen">
+    <link rel="stylesheet" href="{% static "dpaste/bootstrap/css/bootstrap.min.css" %}">
+    <link rel="stylesheet" href="{% static "dpaste/theme.css" %}">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 	{% block extrahead %}{% endblock %}
 </head>
@@ -28,21 +28,29 @@
 
 
 {% block script_footer %}
-<script src="http://code.jquery.com/jquery.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.js"></script>
 <script src="{% static "dpaste/bootstrap/js/bootstrap.min.js" %}"></script>
-<script type="text/javascript">
-$(document).ready(function(){
-    $('#guess_lexer_btn').click(function(){
-        $.getJSON('{% url "snippet_guess_lexer" %}',
-            {'codestring': $('#id_content').val()},
-            function(data){
-                if(data.lexer == "unknown"){
-                    $('#guess_lexer_btn').css('color', 'red');
-                }else{
-                    $('#id_lexer').val(data.lexer);
-                    $('#guess_lexer_btn').css('color', 'inherit');
-                }
-            });
+<script>
+jQuery(function($) {
+    var lexerReq;
+    $('#guess_lexer_btn').click(function() {
+        // Cancel previous request if it is still pending
+        if (lexerReq) {
+            lexerReq.abort();
+        }
+
+        lexerReq = $.getJSON('{% url "snippet_guess_lexer" %}', {
+            codestring: $('#id_content').val()
+        }).done(function(data) {
+            if (data.lexer === 'unknown') {
+                $('#guess_lexer_btn').css('color', 'red');
+            } else {
+                $('#id_lexer').val(data.lexer);
+                $('#guess_lexer_btn').css('color', 'inherit');
+            }
+        }).complete(function() {
+            lexerReq = null;
+        });
     });
 
     $('.autofocus input:text, .autofocus textarea').first().focus();
diff --git a/dpaste/templates/dpaste/snippet_details.html b/dpaste/templates/dpaste/snippet_details.html
index 0001000..b2ce35a 100644
--- a/dpaste/templates/dpaste/snippet_details.html
+++ b/dpaste/templates/dpaste/snippet_details.html
@@ -24,8 +24,8 @@
                     {% if structure.new_level %}<ul><li>{% else %}</li><li>{% endif %}
                     <div>
                     <span class="diff">
-                        <input type="radio" name="a" value="{{ tree_item.id }}" {% ifequal tree_item.id snippet.parent_id %}checked="checked"{% endifequal %}/>
-                        <input type="radio" name="b" value="{{ tree_item.id }}" {% ifequal snippet tree_item %}checked="checked"{% endifequal %}/>
+                        <input type="radio" name="a" value="{{ tree_item.id }}" {% ifequal tree_item.id snippet.parent_id %}checked="checked"{% endifequal %}>
+                        <input type="radio" name="b" value="{{ tree_item.id }}" {% ifequal snippet tree_item %}checked="checked"{% endifequal %}>
                     </span>
                     {% ifequal snippet tree_item %}
                         <strong>#{{ tree_item.id }}</strong>
@@ -36,7 +36,7 @@
                     {% for level in structure.closed_levels %}</li></ul>{% endfor %}
                     {% endfor %}
                     <div class="submit">
-                        <input type="submit" value="{% trans "Compare" %}"/>
+                        <input type="submit" value="{% trans "Compare" %}">
                     </div>
                 </div>
                 </form>
@@ -66,7 +66,7 @@
     <!-- ======================================================================
     Snippet Reply
     ======================================================================= -->
-    <hr/>
+    <hr>
 
     <div class="snippet-reply snippet-reply-hidden">
         <h3>{% trans "Reply to this snippet" %} &rarr;</h3>
@@ -77,77 +77,82 @@
 
 {% block script_footer %}
 {{ block.super }}
-<script type="text/javascript">
-$(document).ready(function(){
-    $('.snippet-reply-hidden').click(function(e){
+<script>
+jQuery(function($) {
+    var diffReq;
+
+    $('.snippet-reply-hidden').click(function(e) {
         $(this).removeClass('snippet-reply-hidden');
     });
 
     /**
-    * Diff Ajax Call
-    */
-    $('.snippet-diff-trigger').click(function(e){
+     * Diff Ajax Call
+     */
+    $('.snippet-diff-trigger').click(function(e) {
         e.preventDefault();
         $('#snippet-diff').slideDown('fast');
         $('#snippet-diff form').submit();
     });
 
 
-    $("form#diffform").submit(function() {
-        var a = $("input[name=a]:checked").val(),
-            b = $("input[name=b]:checked").val(),
-            hash = 'D'+a+','+b;
-        $.get("{% url "snippet_diff" %}", {
+    $('#diffform').submit(function() {
+        var a = $('input[name="a"]:checked').val(),
+            b = $('input[name="b"]:checked').val();
+
+        window.location.hash = 'D' + a + ',' + b;
+
+        // Cancel previous request if it is still pending
+        if (diffReq) {
+            diffReq.abort();
+        }
+
+        diffReq = $.get("{% url "snippet_diff" %}", {
             a: a,
             b: b
-        }, function(data){
+        }).done(function(data) {
             $('#diff').html(data).slideDown('fast');
+        }).complete(function() {
+            diffReq = null;
         });
-        window.location.hash = hash;
+
         return false;
     });
 
     var curLine = document.location.hash,
         hashlist;
 
-    if(curLine.substring(0,2) == '#D'){
+    if (curLine.substring(0, 2) === '#D') {
         hashlist = curLine.substring(2).split(',');
-        if (hashlist.length == 2) {
+        if (hashlist.length === 2) {
             console.log(hashlist);
-            $('form#diffform input[name=a][value='+hashlist[0]+']').attr('checked', true);
-            $('form#diffform input[name=b][value='+hashlist[1]+']').attr('checked', true);
+            $('#diffform input[name="a"][value="' + hashlist[0] + '"]').prop('checked', true);
+            $('#diffform input[name="b"][value="' + hashlist[1] + '"]').prop('checked', true);
             $('#snippet-diff').slideDown('fast');
             $('#snippet-diff form').submit();
         }
     }
 
     /**
-    * Line Highlighting
-    */
-    var curLine = document.location.hash,
-        hashlist;
+     * Line Highlighting
+     */
 
-    if(curLine.substring(0,2) == '#L'){
+    if (curLine.substring(0, 2) === '#L') {
         hashlist = curLine.substring(2).split(',');
-        if (hashlist.length > 0 && hashlist[0] !== "") {
+        if (hashlist.length > 0 && hashlist[0] !== '') {
             $.each(hashlist, function(index, elem){
                 $('.linenums li#' + elem).addClass('marked');
             });
         }
     }
 
-    $('.linenums li').click(function(e){
+    $('.linenums li').click(function(e) {
         var line = $(this),
             hash = 'L';
 
-        if (line.hasClass('marked')) {
-            line.removeClass('marked');
-        } else {
-            line.addClass('marked');
-        }
+        line.toggleClass('marked');
 
         $('.linenums li.marked').each(function (index, elem) {
-            if (hash !== "L") hash += ',';
+            if (hash !== 'L') hash += ',';
             hash += $(elem).attr('id');
         });
 
diff --git a/dpaste/templates/dpaste/snippet_form.html b/dpaste/templates/dpaste/snippet_form.html
index 9d1c927..685bbb6 100644
--- a/dpaste/templates/dpaste/snippet_form.html
+++ b/dpaste/templates/dpaste/snippet_form.html
@@ -40,6 +40,6 @@
             <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
         </div>
         {% endif %}
-        <input tabindex="0" type="submit"class="btn btn-primary" value="{% trans "Paste it" %}"/>
+        <input tabindex="0" type="submit"class="btn btn-primary" value="{% trans "Paste it" %}">
     </div>
 </form>
diff --git a/dpaste/templates/dpaste/snippet_list.html b/dpaste/templates/dpaste/snippet_list.html
index f36c061..21f33c1 100644
--- a/dpaste/templates/dpaste/snippet_list.html
+++ b/dpaste/templates/dpaste/snippet_list.html
@@ -13,7 +13,7 @@
         </a>
     </h4>
     {% include "dpaste/snippet_pre.html" %}
-    {% if not forloop.last %}<hr/>{% endif %}
+    {% if not forloop.last %}<hr>{% endif %}
     {% empty %}
     <p>{% trans "No snippets saved. Either all your snippets are expired or your cookie has changed." %}</p>
     {% endfor %}
