diff --git a/var/www/Flask_server.py b/var/www/Flask_server.py
index 142671fb..41ff187a 100755
--- a/var/www/Flask_server.py
+++ b/var/www/Flask_server.py
@@ -161,7 +161,7 @@ def getmoredata():
     requested_path = request.args.get('paste', '')
     paste = Paste.Paste(requested_path)
     p_content = paste.get_p_content().decode('utf-8', 'ignore')
-    to_return = p_content[max_preview_modal:]
+    to_return = p_content[max_preview_modal-1:]
     return to_return 
 
 
diff --git a/var/www/static/image/loading.gif b/var/www/static/image/loading.gif
new file mode 100644
index 00000000..b60c1615
Binary files /dev/null and b/var/www/static/image/loading.gif differ
diff --git a/var/www/templates/search.html b/var/www/templates/search.html
index 0bafa147..2fef368a 100644
--- a/var/www/templates/search.html
+++ b/var/www/templates/search.html
@@ -70,6 +70,7 @@
           <div id="mymodalcontent" class="modal-content">
             <div id="mymodalbody" class="modal-body" max-width="850px">
               <p>Loading paste information...</p>
+              <img id="loading-gif-modal" src="{{url_for('static', filename='image/loading.gif') }}" height="26" width="26" style="margin: 4px;">
             </div>
             <div class="modal-footer">
               <a id="button_show_path" target="_blank" href=""><button type="button" class="btn btn-info">Show saved paste</button></a>
@@ -160,6 +161,7 @@
 
             $("#button_show_path").attr('href', $(modal).attr('data-url'));
             $("#button_show_path").show('fast');
+            $("#loading-gif-modal").css("visibility", "hidden"); // Hide the loading GIF
             if ($("[data-initsize]").attr('data-initsize') < char_to_display) { // All the content is displayed
                 nothing_to_display();
             }
@@ -180,6 +182,8 @@
     // When the modal goes out, refresh it to normal content
     $("#mymodal").on('hidden.bs.modal', function () {
         $("#mymodalbody").html("<p>Loading paste information...</p>");
+        var loading_gif = "<img id='loading-gif-modal' class='img-center' src=\"{{url_for('static', filename='image/loading.gif') }}\" height='26' width='26' style='margin: 4px;'>";
+        $("#mymodalbody").append(loading_gif); // Show the loading GIF
         $("#button_show_path").attr('href', '');
         $("#button_show_path").hide();
         complete_paste = null;
diff --git a/var/www/templates/searchbox.html b/var/www/templates/searchbox.html
index 415ab15a..ee960f40 100644
--- a/var/www/templates/searchbox.html
+++ b/var/www/templates/searchbox.html
@@ -1,11 +1,16 @@
                           <div class="input-group custom-search-form">
-                              <form action="/search" method=POST>
+                              <form action="/search" id="form-search" method=POST>
                               <input type="text" name="query" class="form-control" placeholder="Search Paste">
                               <span class="input-group-btn">
                               <button class="btn btn-default" type="submit">
                                   <i class="fa fa-search"></i>
                               </button>
+                              <img id="loading-gif" src="{{url_for('static', filename='image/loading2.gif') }}" height="26" width="26" style="margin: 4px; visibility: hidden;">
                               </form>
                           </span>
                           </div>
-
+                          <script> 
+                              $("#form-search").submit(function( event ) {
+                                  $("#loading-gif").css("visibility", "visible");
+                              });
+                          </script>
diff --git a/var/www/templates/show_saved_paste.html b/var/www/templates/show_saved_paste.html
index 924fd2da..ce68465c 100644
--- a/var/www/templates/show_saved_paste.html
+++ b/var/www/templates/show_saved_paste.html
@@ -43,7 +43,7 @@
   </div>
   <div class="panel-body" id="panel-body">
   <h4> Content: </h4>
-  <p data-initsize="{{ initsize }}"> <xmp id="paste-holder"> {{ content }} </xmp> </p>
+  <p data-initsize="{{ initsize }}"> <xmp id="paste-holder">{{ content }}</xmp></p>
   </div>
 </div>