diff --git a/upload/collections.php b/upload/collections.php
index 825340b8..b6897c53 100644
--- a/upload/collections.php
+++ b/upload/collections.php
@@ -71,6 +71,13 @@ $page = mysql_clean($_GET['page']);
 $get_limit = create_query_limit($page,COLLPP);
 $clist = $cond;
 $clist['limit'] = $get_limit;
+if (!isSectionEnabled('photos') && isSectionEnabled('videos')) {
+	$clist['type'] = 'videos';
+} elseif (isSectionEnabled('photos') && !isSectionEnabled('videos')) {
+	$clist['type'] = 'photos';
+} elseif (!isSectionEnabled('photos') && !isSectionEnabled('videos')) {
+	$clist['type'] = 'none';
+}
 $collections = $cbcollection->get_collections($clist);
 
 Assign('collections', $collections);	
diff --git a/upload/styles/cb_27/layout/index.html b/upload/styles/cb_27/layout/index.html
index 41ccbd2e..36dcf005 100644
--- a/upload/styles/cb_27/layout/index.html
+++ b/upload/styles/cb_27/layout/index.html
@@ -1,3 +1,4 @@
+{ANCHOR place="display_head_sec"}
 <div class="container">
 	<div id="fb-root"></div>
 	<script>(function(d, s, id) {
diff --git a/upload/view_collection.php b/upload/view_collection.php
index beda61bb..8c1ea677 100644
--- a/upload/view_collection.php
+++ b/upload/view_collection.php
@@ -41,8 +41,12 @@ if($cbcollection->is_viewable($c))
 		case "photo":
 		case "p":
 		{
-			$items = $cbphoto->collection->get_collection_items_with_details($c,$order,$get_limit);
-			$count = $cbphoto->collection->get_collection_items_with_details($c,NULL,NULL,TRUE);
+			if (isSectionEnabled('photos')) {
+				$items = $cbphoto->collection->get_collection_items_with_details($c,$order,$get_limit);
+				$count = $cbphoto->collection->get_collection_items_with_details($c,NULL,NULL,TRUE);
+			} else {
+				$Cbucket->show_page = false;
+			}
 		}
 		break;
 	}
diff --git a/upload/view_item.php b/upload/view_item.php
index 441a6f05..80e02d86 100644
--- a/upload/view_item.php
+++ b/upload/view_item.php
@@ -79,27 +79,31 @@ if($cbcollection->is_viewable($cid))
 				case "p":
 				{
 					global $cbphoto;
-					$photo = $cbphoto->get_photo($item);
-					if($photo)
-					{
-						$info = $cbphoto->collection->get_collection_item_fields($cid,$photo['photo_id'],'ci_id');
-						if($info)
+					if (isSectionEnabled('photos')) {
+						$photo = $cbphoto->get_photo($item);
+						if($photo)
 						{
-							$photo = array_merge($photo,$info[0]);							
-							increment_views($photo['photo_id'],'photo');
-							
-							assign('object',$photo);
-							assign('user',$userquery->get_user_details($photo['userid']));
-							assign('c',$collect);
-							
-							subtitle($photo['photo_title'].' &laquo; '.$collect['collection_name']);
+							$info = $cbphoto->collection->get_collection_item_fields($cid,$photo['photo_id'],'ci_id');
+							if($info)
+							{
+								$photo = array_merge($photo,$info[0]);							
+								increment_views($photo['photo_id'],'photo');
+								
+								assign('object',$photo);
+								assign('user',$userquery->get_user_details($photo['userid']));
+								assign('c',$collect);
+								
+								subtitle($photo['photo_title'].' &laquo; '.$collect['collection_name']);
+							} else {
+								e(lang("item_not_exist"));
+								$Cbucket->show_page = false;	
+							}
 						} else {
 							e(lang("item_not_exist"));
 							$Cbucket->show_page = false;	
 						}
 					} else {
-						e(lang("item_not_exist"));
-						$Cbucket->show_page = false;	
+						$Cbucket->show_page = false;
 					}
 				}
 				break;