diff --git a/web/pgadmin/browser/templates/browser/body.html b/web/pgadmin/browser/templates/browser/body.html
index 29ea47466..211b7e1b1 100644
--- a/web/pgadmin/browser/templates/browser/body.html
+++ b/web/pgadmin/browser/templates/browser/body.html
@@ -2,33 +2,35 @@
 
 <div id="container" class="browser-pane-container">
 
-<div id="browser" class="pane ui-layout-west" class="browser-browser-pane">
+  <div id="browser" class="pane ui-layout-west browser-browser-pane">
     <p>Browser Pane</p>
-</div>
-
-<div class="pane ui-layout-center browser-inner-pane" id="inner">
-  <div class="pane ui-layout-center browser-center-pane">
-    <ul class="nav nav-tabs browser-tab-bar" role="tablist">
-      <li role="presentation" class="active"><a href="#dashboard" aria-controls="home" role="tab" data-toggle="tab">Dashboard</a></li>
-      <li role="presentation"><a href="#properties" aria-controls="profile" role="tab" data-toggle="tab">Properties</a></li>
-      <li role="presentation"><a href="#statistics" aria-controls="messages" role="tab" data-toggle="tab">Statistics</a></li>
-      <li role="presentation"><a href="#dependencies" aria-controls="settings" role="tab" data-toggle="tab">Dependencies</a></li>
-      <li role="presentation"><a href="#dependents" aria-controls="settings" role="tab" data-toggle="tab">Dependents</a></li>
-    </ul>
-    <div class="tab-content browser-tab-panes">
-      <div role="tabpanel" class="tab-pane browser-tab-pane active" id="dashboard">
-        <iframe class="browser-tab-content" src="http://www.pgadmin.org/" frameborder="0"></iframe>
-      </div>
-      <div role="tabpanel" class="tab-pane browser-tab-pane" id="properties">Properties Pane</div>
-      <div role="tabpanel" class="tab-pane browser-tab-pane" id="statistics">Statistics Pane</div>
-      <div role="tabpanel" class="tab-pane browser-tab-pane" id="dependencies">Dependencies Pane</div>
-      <div role="tabpanel" class="tab-pane browser-tab-pane" id="dependents">Dependents Pane</div>
-    </div>
   </div>
-  <div class="ui-layout-south">SQL Pane</div>
+
+  <div class="pane ui-layout-center browser-inner-pane" id="inner">
+    <div class="pane ui-layout-center browser-center-pane">
+      <ul class="nav nav-tabs browser-tab-bar" role="tablist">
+        <li role="presentation" class="active"><a href="#dashboard" aria-controls="home" role="tab" data-toggle="tab">Dashboard</a></li>
+        <li role="presentation"><a href="#properties" aria-controls="profile" role="tab" data-toggle="tab">Properties</a></li>
+        <li role="presentation"><a href="#statistics" aria-controls="messages" role="tab" data-toggle="tab">Statistics</a></li>
+        <li role="presentation"><a href="#dependencies" aria-controls="settings" role="tab" data-toggle="tab">Dependencies</a></li>
+        <li role="presentation"><a href="#dependents" aria-controls="settings" role="tab" data-toggle="tab">Dependents</a></li>
+      </ul>
+      <div class="tab-content browser-tab-panes">
+        <div role="tabpanel" class="tab-pane browser-tab-pane active" id="dashboard">
+          <iframe class="browser-tab-content" src="http://www.pgadmin.org/"></iframe>
+        </div>
+        <div role="tabpanel" class="tab-pane browser-tab-pane" id="properties">Properties Pane</div>
+        <div role="tabpanel" class="tab-pane browser-tab-pane" id="statistics">Statistics Pane</div>
+        <div role="tabpanel" class="tab-pane browser-tab-pane" id="dependencies">Dependencies Pane</div>
+        <div role="tabpanel" class="tab-pane browser-tab-pane" id="dependents">Dependents Pane</div>
+      </div>
+    </div>
+    <div class="ui-layout-south">SQL Pane</div>
+  </div>
+
 </div>
 
-<script language="javascript">
+<script>
 // create page layout
 $('#container').layout({
         center: {
@@ -82,4 +84,5 @@ $('#dependents a').click(function (e) {
   $(this).tab('show')
 })
 
-</script>
\ No newline at end of file
+</script>
+
diff --git a/web/pgadmin/browser/templates/browser/index.html b/web/pgadmin/browser/templates/browser/index.html
index e4be0f92d..ceac56b12 100644
--- a/web/pgadmin/browser/templates/browser/index.html
+++ b/web/pgadmin/browser/templates/browser/index.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ config.APP_NAME }}{% endblock %}
 {% block body %}
-<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav id="navbar" class="navbar-inverse navbar-fixed-top" role="navigation">
   <div class="container">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -57,7 +57,7 @@
       {% if config.SERVER_MODE %}
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><img src="{{ username | gravatar }}" width="18" height="18"> {{ username }} <span class="caret"></span></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><img src="{{ username | gravatar }}" width="18" height="18" alt="Gravatar image for {{ username }}"> {{ username }} <span class="caret"></span></a>
           <ul class="dropdown-menu">
             <li><a href="{{ url_for('security.change_password') }}">Change Password</a></li>
             <li class="divider"></li>
@@ -74,7 +74,7 @@
 {% include 'browser/body.html' %}
 {% include 'browser/messages.html' %}
 
-<script language="javascript">
+<script>
 {{ js_code|safe }}
 </script>
 
diff --git a/web/pgadmin/static/css/main.css b/web/pgadmin/static/css/main.css
deleted file mode 100644
index b25e769fb..000000000
--- a/web/pgadmin/static/css/main.css
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-/* ==========================================================================
-   Author's custom styles
-   ========================================================================== */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web/pgadmin/static/css/overrides.css b/web/pgadmin/static/css/overrides.css
index 392025eb0..39b4f4eef 100644
--- a/web/pgadmin/static/css/overrides.css
+++ b/web/pgadmin/static/css/overrides.css
@@ -1,4 +1,4 @@
-/* Overrides/fixes for pgAdmin specific styling in Bootstrap */
+/* Overrides/fixes for pgAdmin specific styling */
 
 /* Use the full width of the screen */
 .container {
@@ -14,3 +14,8 @@
     background-color: #428bca;
     color: #fff;
 }
+
+/* iFrames should have no border */
+iframe {
+    border-width: 0;
+}
diff --git a/web/pgadmin/templates/base.html b/web/pgadmin/templates/base.html
index cc430cc9d..e960920ce 100755
--- a/web/pgadmin/templates/base.html
+++ b/web/pgadmin/templates/base.html
@@ -15,7 +15,7 @@
         <meta name="dcterms.dateCopyrighted" content="2014 - 2015">
 
         <link rel="stylesheet" href="{{ url_for('static', filename='css/jquery-layout/layout-default.css') }}" />
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" />
         <link rel="stylesheet" href="{{ url_for('static', filename='css/alertifyjs/alertify.min.css') }}" />
         <link rel="stylesheet" href="{{ url_for('static', filename='css/alertifyjs/themes/bootstrap.min.css') }}" />
         <link rel="stylesheet" href="{{ url_for('static', filename='css/jquery-ui/jquery-ui.min.css') }}" />
@@ -27,7 +27,6 @@
             }
         </style>
         <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap-theme.min.css') }}">
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">
         <link rel="stylesheet" href="{{ url_for('static', filename='css/overrides.css') }}">
 
         <script src="{{ url_for('static', filename='js/vendor/modernizr-2.6.2-respond-1.1.0.min.js') }}"></script>
@@ -44,7 +43,7 @@
         <script src="{{ url_for('static', filename='js/vendor/jquery-layout/jquery.layout.min.js') }}"></script>
         <script src="{{ url_for('static', filename='js/main.js') }}"></script>
         
-        <script language="javascript">
+        <script>
             alertify.defaults.transition = "zoom";
             alertify.defaults.theme.ok = "btn btn-primary";
             alertify.defaults.theme.cancel = "btn btn-danger";