diff --git a/upload/styles/cbv2.7/layout/blocks/photo.html b/upload/styles/cbv2.7/layout/blocks/photo.html
index ef27b9df..7a0b4c58 100644
--- a/upload/styles/cbv2.7/layout/blocks/photo.html
+++ b/upload/styles/cbv2.7/layout/blocks/photo.html
@@ -5,7 +5,9 @@
         <!--<span class="photoname" id="avatar1_file" style="height: 45px; overflow: hidden;" >{$photo.photo_title|truncate:30}</span>-->
         
         <a href="{$cbphoto->photo_links($photo,'view_item')}" title="Tolpis barbata (mariluzpicado)">
-            {get_photo details=$photo size='l' class='photo-land' output='html'}
+            {*get_photo details=$photo size='l' class='photo-land' output='html'*}
+
+           <img alt="{$photo.photo_title}" title="{$photo.photo_title}" class="photo-land" id="photo_{$photo.photo_id}" src="{$baseurl}/styles/cbv2.7/timthumb.php?src={get_photo details=$photo size='o'}&h=150&w=150&zc=1">
         </a>
 
     </div>
diff --git a/upload/styles/cbv2.7/layout/edit_account.html b/upload/styles/cbv2.7/layout/edit_account.html
index 90c1f374..4535361f 100644
--- a/upload/styles/cbv2.7/layout/edit_account.html
+++ b/upload/styles/cbv2.7/layout/edit_account.html
@@ -84,14 +84,20 @@
                               </label>
                           </div>
                           <div class="form-group">
-                              <label>{lang code='account_details'}</label>
+                              <label for="category">{lang code='account_details'}</label>
                               {ANCHOR place=$signup_fields.cat.anchor_before}
+                              {$signup_fields.cat.class='form-control'}
                               {$formObj->createField($signup_fields.cat)}
                               {ANCHOR place=$signup_fields.cat.anchor_after}
-                          </div>
+
+
+                                                  </div>
                           <div class="form-group">
                               <label for="dob">{lang code='user_date_of_birth'}</label>
-                              {ANCHOR place=$signup_fields.dob.anchor_before}{$formObj->createField($signup_fields.dob)}{ANCHOR place=$signup_fields.dob.anchor_after}
+                              {ANCHOR place=$signup_fields.dob.anchor_before}
+                              {$signup_fields.dob.class='form-control'}
+                              {$formObj->createField($signup_fields.dob)}
+                              {ANCHOR place=$signup_fields.dob.anchor_after}
                           </div>
                           {if $cust_signup_fields}
                           {foreach from=$cust_signup_fields item=field}
@@ -107,6 +113,12 @@
                           </div>
                           {/foreach}
                           {/if}
+
+                          <div class="form-group">
+                                  <button name="update_profile" id="button" value="submit" class="btn btn-primary">
+                                      {lang code='update'}
+                                  </button>
+                              </div>
                       </div>
                           </form>
                   </div>
@@ -160,13 +172,14 @@
                   <legend>{lang code='user_user_avatar'}</legend>
                   <div class="show-image">
                     <img src="{$userquery->getUserThumb($user)}" class="img-thumbnail" />
-                    <input type="file" name="avatar_file" id="avatar_file" class="the-buttons btn btn-danger pphotogposition" />
+                    
                   </div>
                   <div class="form-group">
                       <label for="avatar_file">
                           <h4>{lang code='user_user_avatar'}</h4>
                           {lang code='please_select_img_file'}
                       </label>
+                      <input type="file" name="avatar_file" id="avatar_file" class="the-buttons btn" />
                   </div>
                   <h3>{lang code='or'}</h3>
                   <div class="form-group">
@@ -204,16 +217,15 @@
                       <div class="show-image">
                        {if $userquery->getUserBg($user)}
                       <img src="{$userquery->getUserBg($user)}" class="img-thumbnail"/>
-                      <input type="file" name="background_file" id="background_file" value="Change Cover" class="the-buttons btn btn-danger position"  />
+                      <input type="file" name="background_file" id="background_file" value="Change Cover" class="the-buttons btn"  />
                       {else}
                       <em><strong>No Bg</strong></em>
-                       <input type="file" name="background_file" id="background_file" value="Change Cover" class="the-buttons btn btn-danger position"  />
-                       
+                       <input type="file" name="background_file" id="background_file" value="Change Cover" class="the-buttons btn"  />
                       {/if}
 
                       </div>
 
-                       <br><br> 
+                       <br> 
 
                   <h3>{lang code='or'}</h3>
                   <div class="form-group">
diff --git a/upload/styles/cbv2.7/layout/global_header.html b/upload/styles/cbv2.7/layout/global_header.html
index a17c8935..f517f5a4 100644
--- a/upload/styles/cbv2.7/layout/global_header.html
+++ b/upload/styles/cbv2.7/layout/global_header.html
@@ -67,8 +67,9 @@
         <link rel="stylesheet/less" href="{$theme}/less/main.less?cache={$cache_buster}" />
         <script src="{$js}/less.min.js"></script>
         {/if}
-        <script type="text/javascript" src="{$theme}/js/functions.js"></script>
-        <script type="text/javascript" src="{$theme}/js/admin_functions.js"></script>
+        
+        <!--<script type="text/javascript" src="{$theme}/js/functions.js"></script>
+        <script type="text/javascript" src="{$theme}/js/admin_functions.js"></script>-->
         
         <script src="{$theme}/js/bootstrap.min.js"></script>
         <script src="{$theme}/js/masonary.desandro.min.js"></script>
diff --git a/upload/styles/cbv2.7/layout/groups.html b/upload/styles/cbv2.7/layout/groups.html
index 501ab86d..bae48ca2 100644
--- a/upload/styles/cbv2.7/layout/groups.html
+++ b/upload/styles/cbv2.7/layout/groups.html
@@ -91,9 +91,13 @@
                 </div>
             </div>
             <!-- /Page Heading-->
+                {if $groups}
 				{foreach $groups as $key => $group}
                 {include file="$style_dir/blocks/group/group.html"}
 				{/foreach}
+                {else}
+                <div class="col-md-12 nopadding">No Groups</div>
+                {/if}
             <!--Pagination-->
             <div class="clearfix"></div>
             <div align="center">
diff --git a/upload/styles/cbv2.7/layout/index.html b/upload/styles/cbv2.7/layout/index.html
index 36727d7a..c44d4535 100644
--- a/upload/styles/cbv2.7/layout/index.html
+++ b/upload/styles/cbv2.7/layout/index.html
@@ -197,11 +197,12 @@
 		      
 		    	<div class="row nopadding">
 		    		
-		    		  {if $row.photosSection=='yes'}
+		    		  {if $row.photosSection=='yes' }
 		    		 
 					<div class="col-md-12 nopadding ">
 		        				<h2 class="myHeading theme_color">{lang code="Featured Photos"}</h2>
 								
+		        		{if $result_photos1_01}
 		        				<!-- *********** FIRST PHOTOS START ************ //-->
 								<div class="col-md-12 fill-background" style="display:block; height:265px; padding:5px;">
 									<div class="col-md-7 big_img">
@@ -224,6 +225,9 @@
 									</div>
 								</div>
 				        <!-- *********** FIRST PHOTOS END ************ //-->
+				     		{/if}
+
+				    {if $result_photos2_08} 		
 				        <!-- *********** SECOND PHOTOS START ************ //-->
 						<div class="col-md-12" style="display:block; height:265px; padding:5px;">
 
@@ -247,9 +251,12 @@
 					        </div>
 						</div>
 						<!-- *********** SECOND PHOTOS END ************ //-->
+						{/if}
 					</div>
-					{else}	
-					{/if}	
+				{else}
+				<div class="col-md-12 nopadding">No featured Photo</div>
+				{/if}
+			
 						
 				</div>
 
@@ -275,7 +282,8 @@
 			<!-- ******************************************* //-->
 	        <!-- ************* USER BLOCK START ************ //-->
 	        <!-- ******************************************* //-->
-            <div class="col-md-4 side_user_home">
+
+     <div class="col-md-4 side_user_home">
 			<h4 class="home-side-heading">{lang code="Featured Users"}</h4>
                
 			{section name=result_users loop=$result_users}
@@ -331,7 +339,7 @@
 
 			<div class="col-md-4 comment_home side_user_home" >
 					<h4 class="home-side-heading">{lang code="Top Collections"}</h4>
-                
+        {if $collections}        
 				{foreach from=$collections item=collection}
 					<div class="collection_home mouse_hover">
 
@@ -344,6 +352,9 @@
 					<img class="cb_img_thum" src="{$cbcollection->get_thumb($collection,'',TRUE)}"/>
 					</div>
 				{/foreach}
+				{else}
+				<div class="col-md-12 nopadding">No Collection</div>
+				{/if}
 			</div>
 
 		</div>
diff --git a/upload/styles/cbv2.7/layout/photos.html b/upload/styles/cbv2.7/layout/photos.html
index aa5571fc..e929cfeb 100644
--- a/upload/styles/cbv2.7/layout/photos.html
+++ b/upload/styles/cbv2.7/layout/photos.html
@@ -97,7 +97,7 @@
 
                     <!--Sorting By View-->
                     <div class="btn-group">
-                        {if $smarty.get.sorting}   
+                        {if $smarty.get.sorting}
                         {foreach from=$sorting_links item=name key=sort}
                             {if $smarty.get.time==$sort && isset($smarty.get.time)} 
                             <button class="btn btn-default" type="button">
diff --git a/upload/styles/cbv2.7/layout/videos.html b/upload/styles/cbv2.7/layout/videos.html
index c1411cd6..62685b11 100644
--- a/upload/styles/cbv2.7/layout/videos.html
+++ b/upload/styles/cbv2.7/layout/videos.html
@@ -102,6 +102,7 @@
                     </div>
                 {/foreach}
             </div>
+            <div class="clr"></div>
             <!--Pagination-->
             <div align="center">
                 {include file="$style_dir/blocks/pagination.html"}
diff --git a/upload/styles/cbv2.7/layout/view_channel.html b/upload/styles/cbv2.7/layout/view_channel.html
index 4bec1692..bcd3a420 100644
--- a/upload/styles/cbv2.7/layout/view_channel.html
+++ b/upload/styles/cbv2.7/layout/view_channel.html
@@ -93,7 +93,7 @@
       <div class="row">
           <div class="col-md-7 view_chnl">
                 <div id="cb_player" style="height: 380px; width: 657px" >
-                    {FlashPlayer vdetails=$firstVideo width='100%' height='355px'}
+                    {FlashPlayer vdetails=$firstVideo width='100%' height='355'}
                 </div>
               <hr class="hr">
               <div class="row">
@@ -172,8 +172,6 @@ $('#cover_info').show();
 
 
 
-
-
 (function(window){
   $(document).ready(function(){
     var extensions = "{$extensions}";
diff --git a/upload/styles/cbv2.7/layout/view_item.html b/upload/styles/cbv2.7/layout/view_item.html
index de11f36a..fa69859a 100644
--- a/upload/styles/cbv2.7/layout/view_item.html
+++ b/upload/styles/cbv2.7/layout/view_item.html
@@ -15,21 +15,21 @@
 		       </div>
 		   </div> -->
 		   <div>
-				{if $type !='videos'}
+				<!--{if $type !='videos'}
 			
 				<div class="NextPrevButtons">
 					{assign var=objctid value=$object.ci_id}
 					{assign var=collid value=$object.collection_id}
-					 <!-- <li class="moveL">
+					  <li class="moveL">
 					 	{assign var=preLink value=$cbphoto->collection->get_next_prev_item($objctid,$collid,'prev')}
 						<a href="{$cbphoto->photo_links($preLink.0,'view_item')}" >Previous</a>
 					</li> -->
 					<!-- <li class="moveR">
 						{assign var=nextLink value=$cbphoto->collection->get_next_prev_item($objctid,$collid,'next')}
 						<a href="{$cbphoto->photo_links($nextLink.0,'view_item')}" >Next</a>
-					</li> -->
+					</li> 
 				</div>
-				{/if}
+				{/if}-->
 		   </div>
 			{if $type == 'photos'}
 			   {include file="$style_dir/view_photo.html" photo=$object user=$user}
diff --git a/upload/styles/cbv2.7/layout/view_photo.html b/upload/styles/cbv2.7/layout/view_photo.html
index ee718e05..52f297eb 100644
--- a/upload/styles/cbv2.7/layout/view_photo.html
+++ b/upload/styles/cbv2.7/layout/view_photo.html
@@ -7,7 +7,7 @@
                 <div>
                 <a {if $nextLink} {assign var='nextItem' value=$nextLink} {else}  {assign var='nextItem' value=$preLink} {/if}
                 href="{$cbphoto->photo_links($nextItem.0,'view_item')}"
-                >{get_photo details=$photo size='l' class='img-responsive center-block' output='html'}</a>
+                >{get_photo details=$photo size='l' class='img-responsive center-block' output='html' height="100"}</a>
                 {assign var=objctid value=$object.ci_id}
                 {assign var=collid value=$object.collection_id}
                 {assign var=preLink value=$cbphoto->collection->get_next_prev_item($objctid,$collid,'prev')}
diff --git a/upload/styles/cbv2.7/theme/css/channel.css b/upload/styles/cbv2.7/theme/css/channel.css
index a4b1181c..74ae37b4 100644
--- a/upload/styles/cbv2.7/theme/css/channel.css
+++ b/upload/styles/cbv2.7/theme/css/channel.css
@@ -1233,9 +1233,9 @@ background-color: #f8f8f8;
     width: 93.1%;
 }
 .cbHomeVidTitle_slid-title{
-    font-size: 7px;
+    font-size: 14px; #7px
     margin-left: 2px;
-    margin-top: -16px;
+    margin-top: -25px; #-16px
     padding: 2px 5px;
     width: 97.8%;
 }
@@ -1257,11 +1257,11 @@ background-color: #f8f8f8;
   right: 15px;  
 }
 .cbHomeVidDuration_slide{
-    font-size: 7px;
-    height: 18%;
+    font-size: 10px; #7px
+    height: 23%; #18%
     right: 2px;
     top: 2px;
-    width: 15%;
+    width: 25%; #15%
 }
 .cbHomeVidDuration_left{
     background: none repeat scroll 0 0 rgba(0, 0, 0, 0.6);
diff --git a/upload/styles/cbv2.7/theme/css/main.css b/upload/styles/cbv2.7/theme/css/main.css
index 09a3abee..2f22394d 100644
--- a/upload/styles/cbv2.7/theme/css/main.css
+++ b/upload/styles/cbv2.7/theme/css/main.css
@@ -2575,17 +2575,17 @@ a:hover {
 }
 .photos img{
     height: 150px;
-    width: 100%; 
+    #width: 100%; 
 }
 ul#photos li{
 float: left;
     margin-bottom: 15px;
     margin-left: 15px;
-    width: 28%;
+    #width: 28%;
      height: 150px;
 }
 ul#photos li.photo-land-no{
-width: 18.8%;
+#width: 18.8%;
 }
 .like {
     padding-left: 156px;
@@ -2637,7 +2637,7 @@ width: 18.8%;
     padding-left: 30px;
     width: 100px;
     position: absolute;
-    top: 25%;
+    top: 5%; #25%
     right: 0px;
     left: 663px;
 }
@@ -2645,7 +2645,7 @@ width: 18.8%;
     padding-left: 4px;
     width: 100px;
     position: absolute;
-    top: 25%;
+    top: 5%; #25%
     right: 0px;
     left:  15px;
 }
diff --git a/upload/styles/cbv2.7/theme/css/uploader.css b/upload/styles/cbv2.7/theme/css/uploader.css
index 114a2a68..b7973835 100644
--- a/upload/styles/cbv2.7/theme/css/uploader.css
+++ b/upload/styles/cbv2.7/theme/css/uploader.css
@@ -156,4 +156,12 @@
 
   .paddingTop{
     padding-top: 10px;
-  }
\ No newline at end of file
+  }
+
+  .clr{
+    clear: both;
+  }
+  
+  .h_200{
+    height: 200px;
+  }
diff --git a/upload/styles/cbv2.7/theme/less/main.less b/upload/styles/cbv2.7/theme/less/main.less
index 9967e811..3cbdd949 100644
--- a/upload/styles/cbv2.7/theme/less/main.less
+++ b/upload/styles/cbv2.7/theme/less/main.less
@@ -474,3 +474,4 @@ ul{
 @import 'upload.less';
 
 
+