diff --git a/static/resources/css/index.css b/static/resources/css/index.css
index 0ac50ab26..bef7e808e 100644
--- a/static/resources/css/index.css
+++ b/static/resources/css/index.css
@@ -33,15 +33,15 @@ body {
   background-color: #EFEFEF;	
   width: 100%;
   height: 100%;
-  min-width: 1px;
-  overflow: auto;
+  min-width: 1024px;
+  overflow-y: auto;
   min-height: 1px;
 }
 
 .up-section {
   position: relative;
   padding: 15px 15px 15px;
-  margin: 20px -10px 0 0;
+  margin: 20px 0 0 -15px;
   background-color: #FFFFFF;
   height: 277px;
 }
@@ -50,6 +50,11 @@ body {
   margin-left: 5px;
 }
 
+.right-part {
+  padding-right: 0;
+  margin-right: -15px;
+}
+
 .thumbnail {
   margin-top: 10px;
   display: inline-block;
@@ -57,16 +62,21 @@ body {
   padding: 2px;
   box-shadow: none;
   width: 30%;
+  vertical-align: top;
 }
 
 .down-section {
   position: relative;
   padding: 15px 15px 15px;
-  margin: 20px -10px 0 0;
+  margin: 20px -15px 0 -15px;
   background-color: #FFFFFF;
   height: 350px;
 }
 
+.down-section-left {
+  margin-right: 0;
+}
+
 .down-section ul {
   padding: 0;
   margin-left: 30px;
diff --git a/static/resources/css/project.css b/static/resources/css/project.css
index 5f7acecc5..810dddacd 100644
--- a/static/resources/css/project.css
+++ b/static/resources/css/project.css
@@ -5,8 +5,8 @@
 
 .extend-height {
   height: 100%;
-  min-height: 1px;
-  min-width: 1024px;
+  padding-left: 0;
+  padding-right: 0;
 }
 
 .section {
@@ -14,8 +14,8 @@
   margin-top: 20px;
   background-color: #FFFFFF;
   height: 100%;
+  min-height: 640px;
   width: 100%;
-  min-height: 579px;
 }
 
 .search-pane {
@@ -53,6 +53,11 @@
   min-height: 1px;
 }
 
+.tab-pane {
+  min-height: 1px;
+  max-height: 1px;
+}
+
 .sub-pane {
   margin: 15px;
   min-height: 380px;
@@ -60,11 +65,11 @@
 }
 
 .well-custom {
-  position: absolute;
-  width: 1064px;
+  
+  width: 100%;
   background-color: #f5f5f5;
   background-image: none;
-  margin: 0 10px;
+  
   z-index: 10;
 }
 
diff --git a/static/resources/css/repository.css b/static/resources/css/repository.css
index 29fe870cb..65312c29c 100644
--- a/static/resources/css/repository.css
+++ b/static/resources/css/repository.css
@@ -129,10 +129,12 @@
 }
 
 .alert-custom {
-  position: fixed;
-  bottom: 24px;
+  position: relative;
+  bottom: 42px;
   z-index: 99;
-  width: 1110px;
+  width: 1140px;
+  margin-left: auto;
+  margin-right: auto;
   padding: 10px;
   background-color: #f2dede;
   background-image: none;
diff --git a/static/resources/js/components/element-height/element-height.inspector.js b/static/resources/js/components/element-height/element-height.inspector.js
index a1bc00a40..11ce2af2d 100644
--- a/static/resources/js/components/element-height/element-height.inspector.js
+++ b/static/resources/js/components/element-height/element-height.inspector.js
@@ -30,9 +30,10 @@
       scope.$watch(scope.getDimension, function(current) {
         if(current) {
           var h = current.h; 
+          element.css({'height': (h - scope.subsHeight) + 'px'});
           element.find('.section').css({'height': (h - scope.subsHeight - scope.subsSection) + 'px'});        
           element.find('.sub-pane').css({'height': (h - scope.subsHeight - scope.subsSubPane) + 'px'});
-          element.find('.tab-pane').css({'height': (h - scope.subsHeight - scope.subsSubPane) + 'px'});
+          element.find('.tab-pane').css({'height': (h - scope.subsHeight - scope.subsSubPane - scope.subsSection -100) + 'px'});
 //          var subPaneHeight = element.find('.sub-pane').height();
 //          element.find('.table-body-container').css({'height': (subPaneHeight - scope.subsTblBody) + 'px'});
         }
diff --git a/static/resources/js/components/log/advanced-search.directive.js b/static/resources/js/components/log/advanced-search.directive.js
index a64775de7..7f9fd685f 100644
--- a/static/resources/js/components/log/advanced-search.directive.js
+++ b/static/resources/js/components/log/advanced-search.directive.js
@@ -111,7 +111,7 @@
     }
   }
   
-  function advancedSearch() {
+  function advancedSearch(I18nService) {
     var directive = {
       'restrict': 'E',
       'templateUrl': '/static/resources/js/components/log/advanced-search.directive.html',
@@ -133,7 +133,7 @@
     
     function link(scope, element, attrs, ctrl) {
       element.find('.datetimepicker').datetimepicker({
-				locale: 'en-US',
+				locale: I18nService().getCurrentLanguage(),
 				ignoreReadonly: true,
 				format: 'L',
 				showClear: true
diff --git a/static/resources/js/components/replication/create-policy.directive.html b/static/resources/js/components/replication/create-policy.directive.html
index 71e8f1c70..5335b839e 100644
--- a/static/resources/js/components/replication/create-policy.directive.html
+++ b/static/resources/js/components/replication/create-policy.directive.html
@@ -11,7 +11,7 @@
             <div class="col-md-12"  ng-show="vm.toggleErrorMessage">
               <div class="pull-right clearfix" style="padding: 5px 10px;"><a href="javascript:void(0);" ng-click="vm.closeError()"><span class="glyphicon glyphicon-remove"></span></a></div>
               <div class="bg-danger dialog-message">
-                <ul class="list-unstyled" style="color: red; margin: 0;" ng-repeat="msg in vm.errorMessages">
+                <ul class="list-unstyled" style="color: red; margin: 0;" ng-repeat="msg in vm.errorMessages track by $index">
                   <li>// msg //</li>
                 </ul>
               </div>
diff --git a/static/resources/js/components/replication/create-policy.directive.js b/static/resources/js/components/replication/create-policy.directive.js
index f3079cafd..57d9298db 100644
--- a/static/resources/js/components/replication/create-policy.directive.js
+++ b/static/resources/js/components/replication/create-policy.directive.js
@@ -139,6 +139,7 @@
       };
      
       if(vm.checkedAddTarget){
+        
         CreateDestinationService(target.name, target.endpoint, target.username, target.password)
           .success(createDestinationSuccess)
           .error(createDestinationFailed);
@@ -172,7 +173,6 @@
       if(vm.targetEditable) {
         vm.policy.targetId = vm1.selection.id;
         saveDestination();
-        saveOrUpdatePolicy();
       }
     }
         
@@ -278,11 +278,7 @@
     }
     function updateReplicationPolicyFailed(data, status) {
       vm.saveTIP = false;
-      if(status === 409) {
-        vm.errorMessages.push($filter('tr')('policy_already_exists')); 
-      }else{
-        vm.errorMessages.push($filter('tr')('failed_to_update_replication_policy') + data);
-      }
+      vm.errorMessages.push($filter('tr')('failed_to_update_replication_policy') + data);
       console.log('Failed to update replication policy.');
     }
     function createDestinationSuccess(data, status, headers) {
diff --git a/static/resources/js/components/replication/list-replication.directive.js b/static/resources/js/components/replication/list-replication.directive.js
index 40d7354ec..022cbede5 100644
--- a/static/resources/js/components/replication/list-replication.directive.js
+++ b/static/resources/js/components/replication/list-replication.directive.js
@@ -212,7 +212,7 @@
   
   }
   
-  function listReplication($timeout) {
+  function listReplication($timeout, I18nService) {
     var directive = {
       'restrict': 'E',
       'templateUrl': '/static/resources/js/components/replication/list-replication.directive.html',
@@ -296,7 +296,7 @@
       }
       
       element.find('.datetimepicker').datetimepicker({
-				locale: 'en-US',
+				locale: I18nService().getCurrentLanguage(),
 				ignoreReadonly: true,
 				format: 'L',
 				showClear: true
diff --git a/static/resources/js/layout/index/index.controller.js b/static/resources/js/layout/index/index.controller.js
index 5cdad8828..2b4344c54 100644
--- a/static/resources/js/layout/index/index.controller.js
+++ b/static/resources/js/layout/index/index.controller.js
@@ -33,12 +33,12 @@
         indexDesc + 
   			'</p>' +
         '<ul>' +
-  			 '<li class="long-line">▪︎ ' + indexDesc1 + '</li>' +
-  			 '<li class="long-line">▪︎ ' + indexDesc2 + '</li>' +
-  			 '<li class="long-line">▪︎ ' + indexDesc3 + '</li>' +
-  			 '<li class="long-line">▪︎ ' + indexDesc4 + '</li>' +
-  			 '<li class="long-line">▪︎ ' + indexDesc5 + '</li>' +
-         '<li class="long-line">▪︎ ' + indexDesc6 + '</li>' +
+          '<li class="long-line">▪︎ ' + indexDesc1 + '</li>' +
+          '<li class="long-line">▪︎ ' + indexDesc2 + '</li>' +
+          '<li class="long-line">▪︎ ' + indexDesc3 + '</li>' +
+          '<li class="long-line">▪︎ ' + indexDesc4 + '</li>' +
+          '<li class="long-line">▪︎ ' + indexDesc5 + '</li>' +
+          '<li class="long-line">▪︎ ' + indexDesc6 + '</li>' +
   			'</ul>');
       var emitInfo = {
         'contentType': 'text/html',
diff --git a/views/dashboard.htm b/views/dashboard.htm
index 7f5453666..01a2e7d4c 100644
--- a/views/dashboard.htm
+++ b/views/dashboard.htm
@@ -10,7 +10,7 @@
         </div>						
       </div>
       <div class="col-xs-8 col-md-8">
-        <div class="up-section">	
+        <div class="up-section right-part">	
           <top-repository custom-body-height="vm.customBodyHeight"></top-repository>
 		    </div>
 	    </div>
diff --git a/views/index.htm b/views/index.htm
index 983babf73..2c3ca980a 100644
--- a/views/index.htm
+++ b/views/index.htm
@@ -13,7 +13,7 @@
         </div>
       </div>
       <div class="col-md-8">
-	      <div class="up-section">	
+	      <div class="up-section right-part">	
 		      <h4 class="page-header display-inline-block">// 'its_easy_to_get_started' | tr //</h4>
           <div class="page-content">
             <div style="margin-left: auto; margin-right: auto; width: 100%;">		      
@@ -39,7 +39,7 @@
     <div class="row">
       <div class="col-md-4">
     	    <div class="row">
-    	      <div class="down-section">
+    	      <div class="down-section down-section-left">
     	        <h4 class="page-header underlined">// 'why_use_harbor' | tr //</h4>
               <p class="page-content text-justify" style="line-height: 2em; height: 70%;">
       			  // 'index_desc' | tr //
diff --git a/views/repository.htm b/views/repository.htm
index 7aaa0291e..662ce3259 100644
--- a/views/repository.htm
+++ b/views/repository.htm
@@ -26,7 +26,6 @@
               <list-log ng-if="vm.target === 'logs'" section-height="vm.sectionHeight" target="vm.target" publicity="vm.publicity"></list-log>
             </div>
           </div>
-          <dismissable-alerts></dismissable-alerts>
         </div>
       </div>
     </div>
diff --git a/views/sections/footer-content.htm b/views/sections/footer-content.htm
index 8814c01eb..f855ddd21 100644
--- a/views/sections/footer-content.htm
+++ b/views/sections/footer-content.htm
@@ -1,3 +1,4 @@
+<dismissable-alerts></dismissable-alerts>
 <div class="footer-absolute footer" ng-controller="FooterController as vm">
   <p>// 'copyright' | tr // © 2015-2016 VMware, Inc. // 'all_rights_reserved' | tr //</p>
 </div>