diff --git a/configure.in b/configure.in
index b24fa11..01431ea 100644
--- a/configure.in
+++ b/configure.in
@@ -132,6 +132,17 @@ PKG_CHECK_MODULES([EWL], ewl,
    ]
 )
 
+PKG_CHECK_MODULES([EFREET_MIME], efreet-mime,
+   [
+      have_efreet_mime="Yes"
+   ],
+   [
+      have_efreet_mime="No"
+      echo "Efreet_Mime was not found by pkg-config!";
+      AC_MSG_ERROR([Ephoto needs efreet_mime to compile.])
+   ]
+)
+
 PKG_CHECK_MODULES([EPSILON], epsilon,
    [
       have_epsilon="Yes"
@@ -178,6 +189,7 @@ echo
 echo "  Evas ............: $have_evas"
 echo "  Ecore ...........: $have_ecore"
 echo "  Edje ............: $have_edje"
+echo "  Efreet_Mime .....: $have_efreet_mime"
 echo "  Epsilon .........: $have_epsilon"
 echo "  Ewl .............: $have_ewl"
 echo "  Libexif .........: $have_exif"
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index ffffcc8..6ac0712 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -19,6 +19,7 @@ FILES = add.png \
 	media-seek-backward.png \
 	media-seek-forward.png \
 	normal_view.png \
+	photo_lens.png \
 	preferences-system.png \
 	redo.png \
 	remove.png \
diff --git a/data/images/photo_lens.png b/data/images/photo_lens.png
new file mode 100644
index 0000000..ee4e323
Binary files /dev/null and b/data/images/photo_lens.png differ
diff --git a/src/bin/ephoto_browser.c b/src/bin/ephoto_browser.c
index 51b609e..16f0e42 100644
--- a/src/bin/ephoto_browser.c
+++ b/src/bin/ephoto_browser.c
@@ -14,16 +14,20 @@ static unsigned int directory_data_count(void *data);
 static void destroy(Ewl_Widget *w, void *event, void *data)
 {
 	ewl_widget_destroy(w);
+	em->bwin = NULL;
 }
 
 void show_browser(Ewl_Widget *w, void *event, void *data)
 {
-	em->bwin = add_window("Browser!", 200, 400, destroy, NULL);
+	if (!em->bwin)
+	{
+		em->bwin = add_window("Browser!", 200, 400, destroy, NULL);
 
-	em->dtree = add_dtree(em->bwin);
-        ewl_object_maximum_w_set(EWL_OBJECT(em->dtree), 200);
+		em->dtree = add_dtree(em->bwin);
+        	ewl_object_maximum_w_set(EWL_OBJECT(em->dtree), 200);
 
-	populate_directories(NULL, NULL, NULL);
+		populate_directories(NULL, NULL, NULL);
+	}
 }
 
 /*Create and Add a Tree to the Container c*/
diff --git a/src/bin/ephoto_dialogs.c b/src/bin/ephoto_dialogs.c
index 0dd94a3..7bd1f23 100644
--- a/src/bin/ephoto_dialogs.c
+++ b/src/bin/ephoto_dialogs.c
@@ -17,31 +17,34 @@ static void close_dialog(Ewl_Widget *w, void *event, void *data)
 /*Add an About Dialog*/
 void about_dialog(Ewl_Widget *w, void *event, void *data)
 {
-	Ewl_Widget *window, *button, *vbox, *text;
+	Ewl_Widget *window, *button, *image, *vbox, *text;
 	
-	window = add_window("About Ephoto", 200, 100, NULL, NULL);
+	window = add_window("About Ephoto", 300, 400, NULL, NULL);
         ewl_callback_append(window, EWL_CALLBACK_DELETE_WINDOW, close_dialog, window);
 
         vbox = add_box(window, EWL_ORIENTATION_VERTICAL, 3);
         ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
 
+	image = add_image(vbox, PACKAGE_DATA_DIR "/images/photo_lens.png", 0, NULL, NULL);
+	ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
+
 	text = add_text(vbox, "Ephoto is an advanced image viewer that allows\n"
-		       "you to view images in several methods. They\n"
+		       "you to view images using several methods. They\n"
 		       "include an icon view, a list view, and a single\n"
 		       "image view.  You can also view exif data, view\n"
 		       "images in a fullscreen mode, and view images in a\n"
 		       "slideshow.  The edit view offers simple and advanced\n"
-		       "editing options including rotations, flips, blurs,\n"
-		       "sharpens, conversion to black and white, and\n"
-		       "conversions to sepia.");
+		       "editing options.");
 
 	ewl_text_wrap_set(EWL_TEXT(text), EWL_TEXT_WRAP_WORD);
+        ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
 
 	button = add_button(vbox, "Close",
                                 PACKAGE_DATA_DIR "/images/dialog-close.png",
                                                                 close_dialog, window);
         ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);
-	
+	ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);	
+
 	return;
 }
 
diff --git a/src/bin/ephoto_edit_view.c b/src/bin/ephoto_edit_view.c
index 7a11c70..699e690 100644
--- a/src/bin/ephoto_edit_view.c
+++ b/src/bin/ephoto_edit_view.c
@@ -83,7 +83,7 @@ void show_edit_view(Ewl_Widget *w, void *event, void *data)
 {
         ewl_notebook_visible_page_set(EWL_NOTEBOOK(em->view_box), em->edit_vbox);
 	ewl_image_file_path_set(EWL_IMAGE(em->eimage), ecore_dlist_current(em->images));
-	ewl_widget_enable(em->smi);
+	
 	return;
 }
 
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index d260f33..59a96e9 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -63,22 +63,25 @@ void create_main(void)
         buf[sizeof(buf)-1] = '\0';
         em->current_directory = strdup(buf);
 
-	em->win = add_window("Ephoto!", 800, 600, destroy, NULL);
+	em->bwin = NULL;
+
+	em->win = add_window("Ephoto!", 600, 475, destroy, NULL);
 
 	vbox = add_box(em->win, EWL_ORIENTATION_VERTICAL, 5);
 	ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
 
 	mb = add_menubar(vbox);
+	
 	menu = add_menu(mb, "File");
-	em->smi = add_menu_item(menu, "Save Image As", 
-				PACKAGE_DATA_DIR "/images/stock_save-as.png", 
-							save_dialog, NULL);
-	ewl_widget_disable(em->smi);
 	mi = add_menu_item(menu, "Exit", 
 				PACKAGE_DATA_DIR "/images/exit.png", 
 							destroy, NULL);
 	menu = add_menu(mb, "Albums");
 
+	menu = add_menu(mb, "View");
+	mi = add_menu_item(menu, "Browser",
+				NULL, show_browser, NULL);
+
 	menu = add_menu(mb, "Help");
         mi = add_menu_item(menu, "About",
                                 PACKAGE_DATA_DIR "/images/stock_help.png",