diff --git a/upload/styles/cb_2013/layout/footer.html b/upload/styles/cb_2013/layout/footer.html
index 7a460b77..06e2d107 100644
--- a/upload/styles/cb_2013/layout/footer.html
+++ b/upload/styles/cb_2013/layout/footer.html
@@ -1,12 +1,22 @@
 
 <footer>
-    <div id="footer">
-        <ul>
-            <li><a href="#">ClipBucket</a></li>
-            <li><a href="#">Good Page</a></li>
-            <li><a href="#">Bad Page</a></li>
-            <li><a href="#">Faqs Page</a></li>
-        </ul>
+    <div id="footer" class="row">
+        <div class="col-md-6">
+            <ul>
+                <li><a href="#">ClipBucket</a></li>
+                <li><a href="#">Good Page</a></li>
+                <li><a href="#">Bad Page</a></li>
+                <li><a href="#">Faqs Page</a></li>
+            </ul>
+        </div>
+        <div class="col-md-6">
+            <ul class="pull-right">
+                <li><a href="#">Terms of Use</a></li>
+                <li><a href="#">Privacy Policy</a></li>
+                <li><a href="#">Bad Page</a></li>
+                <li><a href="#">&copy; 2013 Clipbucket.com</a></li>
+            </ul>
+        </div>
     </div>
 </footer>
 {$Cbucket->footer()}
\ No newline at end of file
diff --git a/upload/styles/cb_2013/layout/header.html b/upload/styles/cb_2013/layout/header.html
index 6712b795..da032f3d 100644
--- a/upload/styles/cb_2013/layout/header.html
+++ b/upload/styles/cb_2013/layout/header.html
@@ -1,6 +1,6 @@
-<header>
+
     <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
-        <div class="navbar-container">
+        <div class="navbar-container clearfix">
             <!-- Brand and toggle get grouped for better mobile display -->
             <div class="navbar-header">
 
@@ -149,7 +149,6 @@
 
 
     </nav>
-</header>
 
 <script>
     $('.nav-login-dd li .dropdown-menu').click(function(e){
diff --git a/upload/styles/cb_2013/layout/index.html b/upload/styles/cb_2013/layout/index.html
index 4ce645a7..a2092cd0 100644
--- a/upload/styles/cb_2013/layout/index.html
+++ b/upload/styles/cb_2013/layout/index.html
@@ -4,7 +4,7 @@
     
     <div class="row">
         <div class="video_items">
-        {for $foo=1 to 5}
+        {for $foo=1 to 9}
             <div class="the_item col-md-3 col-lg-3 col-sm-6 col-xs-12">
             {include file="$style_dir/blocks/videos/video.html"}
             </div>
diff --git a/upload/styles/cb_2013/layout/upload.html b/upload/styles/cb_2013/layout/upload.html
new file mode 100644
index 00000000..bf944004
--- /dev/null
+++ b/upload/styles/cb_2013/layout/upload.html
@@ -0,0 +1,147 @@
+<div class="container upload-container">
+    <div class="row">
+        <div class="col-md-8">
+            <div class="cb-box pad-bottom-sm progress-container">
+                <div class="row">
+                    <div class="col-md-3">
+                        <p>Uploading 1 of 2</p>
+                    </div>
+                    <div class="col-md-9">
+                        <div class="progress">
+                            <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
+                                <span class="sr-only">40% Complete (success)</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="cb-box pad-bottom">
+                <ul class="nav nav-tabs">
+                    <li class="active"><a href="#file-upload" data-toggle="tab">File Upload</a></li>
+                    <li><a href="#remote-upload" data-toggle="tab">Remote Upload</a></li>
+                    <li><a href="#remote-play" data-toggle="tab">Remote Play</a></li>
+                    <li><a href="#embed-code" data-toggle="tab">Embed Code</a></li>
+                </ul>
+                <div class="tab-content">
+                    <div class="tab-pane fade in active" id="file-upload">file upload</div>
+                    <div class="tab-pane fade" id="remote-upload">remote upload</div>
+                    <div class="tab-pane fade" id="remote-play">remote play</div>
+                    <div class="tab-pane fade" id="embed-code">embed code</div>
+                </div>
+            </div>
+
+        </div>
+        <div class="col-md-4">
+
+            <div class="pad-bottom-sm submit-container">
+                <button class="btn btn-primary btn-lg">Submit Now</button>
+            </div>
+
+            <div class="cb-box pad-bottom-sm download-container">
+                <div class="checkbox">
+                    <label>
+                        <span><input type="checkbox"></span>
+                        <span class="glyphicon glyphicon-cloud-download"></span>
+                        <span>Allow Download</span>
+                    </label>
+                </div>
+            </div>
+
+            <div class="cb-box pad-bottom-sm">
+                <div class="form-group">
+                    <label for="categories">Categories</label>
+                    <select class="form-control" id="categories">
+                        <option>1</option>
+                        <option>2</option>
+                        <option>3</option>
+                        <option>4</option>
+                        <option>5</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="cb-box pad-bottom-sm sharing-contatiner">
+                <div class="form-group">
+                    <label>Sharing Options</label>
+                </div>
+                <div class="radio">
+                    <label>
+                        <input type="radio" name="sharing-options" id="sharing-options-1" value="option1" checked>
+                        Public - Upload can be seen by everyone
+                    </label>
+                </div>
+                <div class="radio">
+                    <label>
+                        <input type="radio" name="sharing-options" id="sharing-options-2" value="option2">
+                        Private - Upload can be seen only by you
+                    </label>
+                </div>
+                <div class="radio">
+                    <label>
+                        <input type="radio" name="sharing-options" id="sharing-options-3" value="option3">
+                        Unlisted - Only people with password can see
+                    </label>
+                </div>
+                <div class="radio">
+                    <label>
+                        <input type="radio" name="sharing-options" id="sharing-options-4" value="option4">
+                        Members only - Only members can see
+                    </label>
+                </div>
+                <div class="form-group">
+                    <label for="protected_password" class="light">Set Password</label>
+                    <input type="password" class="form-control" id="protected_password" placeholder="Enter password to make it protected">
+                </div>
+                <div class="form-group">
+                    <label for="allowed_users" class="light">Allowed Users</label>
+                    <input type="password" class="form-control" id="allowed_users" placeholder="Enter users who can watch this video">
+                </div>
+                <div class="checkbox">
+                    <label class="light">
+                        <input type="checkbox" value="">
+                        Allow comments
+                    </label>
+                </div>
+                <div class="checkbox">
+                    <label class="light">
+                        <input type="checkbox" value="">
+                        Allow comment voting
+                    </label>
+                </div>
+                <div class="checkbox">
+                    <label class="light">
+                        <input type="checkbox" value="">
+                        Allow rating
+                    </label>
+                </div>
+                <div class="checkbox">
+                    <label class="light">
+                        <input type="checkbox" value="">
+                        Allow embedding on other websites
+                    </label>
+                </div>
+            </div>
+            <div class="cb-box pad-bottom terms-contatiner">
+                <div class="checkbox">
+                    <label class="light">
+                        <input type="checkbox" value="">
+                        I have read and agree to submission policy
+                    </label>
+                </div>
+                <div class="checkbox">
+                    <label class="light">
+                        <input type="checkbox" value="">
+                        I have read and agree to terms and conditions
+                    </label>
+                </div>
+                <div class="checkbox">
+                    <label class="light">
+                        <input type="checkbox" value="">
+                        Remember these settings
+                    </label>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/upload/styles/cb_2013/layout/videos.html b/upload/styles/cb_2013/layout/videos.html
index 6103a804..47716b65 100644
--- a/upload/styles/cb_2013/layout/videos.html
+++ b/upload/styles/cb_2013/layout/videos.html
@@ -1,9 +1,9 @@
 <div class="container">
     <div class="row">
-        <div class="test_bg col-md-2 col-sm-2 col-lg-2">
+        <div class="side_bar col-md-2 col-sm-2 col-lg-2">
 
         </div>
-        <div class="video_items test_bg bg1 col-md-10 col-sm-10 col-lg-10">
+        <div class="video_items">
             {foreach $videos as $video}
                 <div class="the_item col-md-3 col-lg-3 col-sm-6 col-xs-12">
                     {include file="$style_dir/blocks/videos/video.html"}
diff --git a/upload/styles/cb_2013/theme/less/footer.less b/upload/styles/cb_2013/theme/less/footer.less
index 785b4637..1efb550b 100644
--- a/upload/styles/cb_2013/theme/less/footer.less
+++ b/upload/styles/cb_2013/theme/less/footer.less
@@ -1,7 +1,8 @@
 #footer{
-  margin:auto;
+  margin: 0px 30px;
   ul{
     maring:0px; padding:0px;
+    margin-top: 20px;
     li{
       display: inline-block;
       margin-right:15px;
diff --git a/upload/styles/cb_2013/theme/less/main.less b/upload/styles/cb_2013/theme/less/main.less
index 9db954a1..a87bca6c 100644
--- a/upload/styles/cb_2013/theme/less/main.less
+++ b/upload/styles/cb_2013/theme/less/main.less
@@ -33,7 +33,7 @@ body{
   color : @font-color;
   font-family: @font-family;
   font-size:@font-size;
-  padding-top: 70px;
+  padding-top: 85px;
 }
 
 img {max-width:100%; }
@@ -44,7 +44,7 @@ html,body{  height: 100%; }
   //width : @container-width;
   min-height: 100%;
   height: auto !important;
-  height: 100%;
+  /*min-height: 100%;*/
   /* Negative indent footer by it's height */
   margin: 0 auto -@footer-height;
   position: relative;
@@ -104,3 +104,6 @@ html,body{  height: 100%; }
 /* Importing video css */
 @import 'video.less';
 
+/* Importing upload css */
+@import 'upload.less';
+
diff --git a/upload/styles/cb_2013/theme/less/nav.less b/upload/styles/cb_2013/theme/less/nav.less
index ec3f4efc..78359f2b 100644
--- a/upload/styles/cb_2013/theme/less/nav.less
+++ b/upload/styles/cb_2013/theme/less/nav.less
@@ -17,7 +17,7 @@
       height: @logo-height;
       text-indent: -500000px;
       display: inline-block;
-      margin-top:9px;
+      margin-top:12px;
     }
 
     @media (min-width:768px)
@@ -90,6 +90,7 @@
 .navbar{
   line-height: 60px;
   .box-shadow(0px;0px;10px;rgba(0,0,0,0.2));
+  padding: 0px 20px;
 }
 
 .navbar-default .navbar-nav>li>a{color:@link-color; outline: none;}
diff --git a/upload/styles/cb_2013/theme/less/upload.less b/upload/styles/cb_2013/theme/less/upload.less
new file mode 100644
index 00000000..efdfa8f6
--- /dev/null
+++ b/upload/styles/cb_2013/theme/less/upload.less
@@ -0,0 +1,57 @@
+.upload-container {
+  p {
+    font-size: 14px;
+  }
+  .progress-container {
+    p {
+      margin: 0px;
+    }
+    .progress {
+      margin-bottom: 0px;
+    }
+  }
+
+  .submit-container {
+    text-transform:uppercase;
+    margin-bottom: 25px;
+    .btn {
+      width: 100%;
+    }
+  }
+
+  .download-container {
+    .checkbox {
+      margin: 0px 25px;
+      span {
+        margin-right: 8%;
+      }
+    }
+  }
+
+  .sharing-contatiner {
+    .radio {
+      label {
+        font-size: 14px;
+      }
+    }
+    .form-group, .checkbox {
+      label {
+        &.light {
+          font-weight: normal;
+          font-size: 15px;
+        }
+      }
+    }
+  }
+
+  .terms-contatiner {
+    .checkbox {
+      label {
+        &.light {
+          font-weight: normal;
+          font-size: 14px;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file