diff --git a/islandora-object-edit.tpl.php b/islandora-object-edit.tpl.php
index e58ec9c6..e760a429 100644
--- a/islandora-object-edit.tpl.php
+++ b/islandora-object-edit.tpl.php
@@ -47,12 +47,12 @@
 //dsm($object);
 
 drupal_set_title($islandora_object->label);
-
+$islandora_datastreams = $variables['islandora_datastreams'];
 print($islandora_object->label . ' ' . $islandora_object->id);
 print('this is the edit template');
 print ('<h3>datastreams</h3>');
-foreach ($islandora_object as $ds) {
-  print $ds->label . '<br>';
+foreach ($islandora_datastreams as $key => $ds) {
+  print $key. '<br />';
   //do something
 }
 ?>
diff --git a/islandora.info b/islandora.info
index 83a56d3b..6d2cfb99 100644
--- a/islandora.info
+++ b/islandora.info
@@ -3,3 +3,5 @@ description = "View and manage Fedora objects"
 package = Islandora
 version = 7.x-dev
 core = 7.x
+stylesheets[all][] = css/islandora.base.css
+stylesheets[all][] = css/islandora.theme.css
\ No newline at end of file
diff --git a/islandora.module b/islandora.module
index 99530ca8..1b67a5d0 100644
--- a/islandora.module
+++ b/islandora.module
@@ -303,7 +303,7 @@ function islandora_islandora_edit_object($fedora_object) {
   $supported_models = islandora_get_types();
   $output = "";
   foreach ($fedora_object->models as $model) {
-    if ($supported_models[$model][ISLANDORA_EDIT_HOOK] == TRUE) {//another module is handling the view
+    if (isset($supported_models[$model][ISLANDORA_EDIT_HOOK]) && $supported_models[$model][ISLANDORA_EDIT_HOOK] == TRUE) {//another module is handling the view
       return;
     }
   }
@@ -424,9 +424,16 @@ function islandora_islandora_view_object($object) {
   $object_models = $object->models;
   $combined_list = array_intersect($supported_models, $object->models);
   $output = "";
+<<<<<<< HEAD
   if (empty($combined_list)) {
     $output = theme('islandora_default', array('islandora_object' => $object));
     return array('Default Output' => $output);
+=======
+  foreach ($object->models as $model) {
+    if (isset($supported_models[$model][ISLANDORA_VIEW_HOOK]) && $supported_models[$model][ISLANDORA_VIEW_HOOK] == TRUE) {//another module is handling the view
+      return;
+    }
+>>>>>>> a364874a78dd45f202ba5ef18292bf77f6bf591e
   }
 }
 
@@ -519,5 +526,14 @@ function islandora_preprocess_islandora_default(&$variables) {
 }
 
 function islandora_preprocess_islandora_default_edit(&$variables) {
-  //$islandora_object = $variables['islandora_object'];
+  $islandora_object = $variables['islandora_object'];
+  global $base_url;
+  $datastreams = array();
+  foreach ($islandora_object as $ds) {
+    $datastreams['download_url'] = $base_url . '/islandora/object/' . $islandora_object->id . 'datastream/' . $ds->id .'/download';
+    $datastreams['view_url'] = $base_url . '/islandora/object/' . $islandora_object->id . 'datastream/' . $ds->id .'/view';
+    $datastreams['delete_url'] = $base_url . '/islandora/object/' . $islandora_object->id . 'datastream/' . $ds->id .'/delete';
+    $variables['islandora_datastreams'][$ds->id] = $datastreams;
+    
+  }
 }
\ No newline at end of file
diff --git a/islandora_basic_collection/islandora_basic_collection.info b/islandora_basic_collection/islandora_basic_collection.info
index fb76c4f2..0254df74 100644
--- a/islandora_basic_collection/islandora_basic_collection.info
+++ b/islandora_basic_collection/islandora_basic_collection.info
@@ -3,3 +3,5 @@ description = "A default Islandora Repository module to handle simple collection
 dependencies[] = islandora
 package = Islandora
 core = 7.x
+stylesheets[all][] = css/islandora_basic_collection.base.css
+stylesheets[all][] = css/islandora_basic_collection.theme.css
diff --git a/islandora_basic_collection/islandora_basic_collection.module b/islandora_basic_collection/islandora_basic_collection.module
index 0ff65172..64e5e80d 100644
--- a/islandora_basic_collection/islandora_basic_collection.module
+++ b/islandora_basic_collection/islandora_basic_collection.module
@@ -72,7 +72,7 @@ function islandora_basic_collection_islandora_view_object($object, $user, $page_
   $cmodel_list = islandora_basic_collection_islandora_get_types();
   $models = $object->models;
   foreach ($object->models as $model) {
-    if ($cmodel_list[$model][ISLANDORA_VIEW_HOOK] == TRUE) {
+    if (isset($cmodel_list[$model][ISLANDORA_VIEW_HOOK]) && $cmodel_list[$model][ISLANDORA_VIEW_HOOK]  == TRUE) {
       $output = theme('islandora_basic_collection', array('islandora_object' => $object));
       return array('Basic Collection Output' => $output);
     }
diff --git a/islandora_basic_image/islandora_basic_image.info b/islandora_basic_image/islandora_basic_image.info
index 48518184..26426dd0 100644
--- a/islandora_basic_image/islandora_basic_image.info
+++ b/islandora_basic_image/islandora_basic_image.info
@@ -3,3 +3,5 @@ description = "A default Islandora Repository module to handle images"
 dependencies[] = islandora
 package = Islandora
 core = 7.x
+stylesheets[all][] = css/islandora_basic_image.base.css
+stylesheets[all][] = css/islandora_basic_image.theme.css
\ No newline at end of file
diff --git a/islandora_basic_image/islandora_basic_image.module b/islandora_basic_image/islandora_basic_image.module
index be687dcf..281cc2f4 100644
--- a/islandora_basic_image/islandora_basic_image.module
+++ b/islandora_basic_image/islandora_basic_image.module
@@ -75,7 +75,7 @@ function islandora_basic_image_islandora_view_object($object, $user, $page_numbe
   $cmodel_list = islandora_basic_image_islandora_get_types();
   $models = $object->models;
   foreach ($object->models as $model) {
-    if ($cmodel_list[$model][ISLANDORA_VIEW_HOOK] == TRUE) {
+    if (isset($cmodel_list[$model][ISLANDORA_VIEW_HOOK]) && $cmodel_list[$model][ISLANDORA_VIEW_HOOK] == TRUE) {
       $output = theme('islandora_basic_image', array('islandora_object' => $object));
       return array('Basic Image Output' => $output);
     }