diff --git a/data/themes/default/ephoto.edc b/data/themes/default/ephoto.edc
index 67d9f72..f9a95bd 100644
--- a/data/themes/default/ephoto.edc
+++ b/data/themes/default/ephoto.edc
@@ -11,7 +11,8 @@ collections
 		image: "move_left.png" COMP;
 		image: "move_right.png" COMP;
 		image: "thumb_shadow.png" COMP;
-		image: "selected.png" COMP;
+		image: "left_arrow.png" COMP;
+		//image: "thumb_shadow_selected.png" COMP;
 	}
 	group 
 	{
@@ -91,13 +92,14 @@ collections
                                 description
                                 {
                                         state: "default" 0.0;
+					visible: 1;
                                         rel1.relative: 0.0 0.0;
                                         rel1.offset: 27 0;
                                         rel2.relative: 1.0 1.0;
                                         rel2.offset: -27 -1;
                                         color: 255 255 255 255;
                                 }
-                        }
+			}
 			part
 			{
 				name: "ephoto.text.object";
@@ -135,7 +137,15 @@ collections
 					rel2.to: "thumb_area";
 					rel2.relative: 1.0 1.0;
 					rel2.offset: -1 -1;
+					color: 255 255 255 255;
 				}
+				description
+                                {
+                                        state: "hidden" 0.0;
+                                        inherit: "default" 0.0;
+                                        visible: 0;
+                                        color: 255 255 255 0;
+                                }
 			}
 			part
 			{
@@ -172,6 +182,24 @@ collections
                                 }
                         }
 		}
+		programs {
+                        program {
+                                name: "hidden";
+                                signal: "ephoto.browser.hidden";
+                                source: "ephoto";
+                                action: STATE_SET "hidden" 0.0;
+                                transition: LINEAR 0.6;
+                                target: "ephoto.swallow.content";
+                        }
+                        program {
+                                name: "visible";
+                                signal: "ephoto.browser.visible";
+                                source: "ephoto";
+                                action: STATE_SET "default" 0.0;
+                                transition: LINEAR 0.6;
+                                target: "ephoto.swallow.content";
+                        }
+                }
 	}
 	group {
 		name: "/ephoto/thumb/shadow";
@@ -190,17 +218,22 @@ collections
 					rel2.relative: 1.0 1.0;
 					color: 255 255 255 255;
 				}
+				description {
+                                        state: "selected" 0.0;
+                                        inherit: "default" 0.0;
+                                        color: 255 255 255 255;
+                                }
 				description {
 					state: "hidden" 0.0;
 					inherit: "default" 0.0;
-					visible: 0;
 					color: 255 255 255 0;
+					visible: 0;
 				}
 			}
 			part {
 				name: "background";
 				type: IMAGE;
-				mouse_events: 0;
+				mouse_events: 1;
 				description {
 					state: "default" 0.0;
                                         visible: 1;
@@ -217,6 +250,8 @@ collections
 					state: "selected" 0.0;
 					inherit: "default" 0.0;
 					color: 255 255 255 255;
+					//image.normal: "thumb_shadow_selected.png";
+					//image.border: 12 12 7 13;
 				}
 				description {
 					state: "hidden" 0.0;
@@ -248,16 +283,18 @@ collections
 				signal: "ephoto.thumb.hidden";
 				source: "ephoto";
 				action: STATE_SET "hidden" 0.0;
-				transition: LINEAR 0.6;
+				transition: DECELERATE 0.3;
 				target: "background";
+				target: "ephoto.swallow.content";
 			}
 			program {
 				name: "visible";
 				signal: "ephoto.thumb.visible";
 				source: "ephoto";
 				action: STATE_SET "default" 0.0;
-				transition: LINEAR 0.6;
-				target: "background";	
+				transition: DECELERATE 0.3;
+				target: "background";
+				target: "ephoto.swallow.content";	
 			}
 		}
 	}
@@ -306,23 +343,6 @@ collections
 					color: 255 255 255 0;
 				}
 			}
-			part {
-                                name: "selected";
-                                type: IMAGE;
-                                description {
-                                        state: "default" 0.0;
-                                        visible: 0;
-                                        min: 10 10;
-                                        rel1.to: "clipper";
-                                        rel2.to: "clipper";
-                                        image.normal: "selected.png";
-                                }
-                                description {
-                                        state: "selected" 0.0;
-                                        inherit: "default" 0.0;
-                                        visible: 1;
-                                }
-                        }
 			part {
 				name: "event_area";
 				type: RECT;
@@ -341,28 +361,12 @@ collections
 			}
 		}
 		programs {
-			program {
-				name: "selected";
-				signal: "ephoto.thumb.selected";
-				source: "ephoto";
-				action: STATE_SET "selected" 0.0;
-				transition: LINEAR 0.3;
-				target: "selected";
-			}
-			program {
-				name: "deselected";
-				signal: "ephoto.thumb.deselected";
-				source: "ephoto";
-				action: STATE_SET "default" 0.0;
-				transition: LINEAR 0.3;
-				target: "selected";
-			}
 			program {
 				name: "hidden";
 				signal: "ephoto.thumb.hidden";
 				source: "ephoto";
 				action: STATE_SET "hidden" 0.0;
-				transition: LINEAR 0.6;
+				transition: DECELERATE 0.3;
 				target: "ephoto.swallow.content";
 				target: "clipper";
 			}
@@ -371,11 +375,130 @@ collections
 				signal: "ephoto.thumb.visible";
 				source: "ephoto";
 				action: STATE_SET "default" 0.0;
-				transition: LINEAR 0.6;
+				transition: LINEAR 0.3;
 				target: "ephoto.swallow.content";
 				target: "clipper";	
 			}
 		}
 	}
+	group
+	{
+		name: "/ephoto/flow/view";
+		parts
+		{
+			part
+			{
+				name: "back";
+				type: IMAGE;
+				mouse_events: 1;
+				description
+                                {
+                                        state: "default" 0.0;
+                                        visible: 1;
+					min: 32 32;
+					max: 32 32;
+                                        rel1.relative: 0.0 0.0;
+                                        rel1.offset: 50 50;
+                                        rel2.relative: 0.0 0.0;
+                                        rel2.offset: -1 -1;
+                                        color: 255 255 255 255;
+					image.normal: "left_arrow.png";
+                                }
+			}
+			part
+			{
+				name: "image_area";
+				type: RECT;
+				mouse_events: 1;
+                                description
+                                {
+                                        state: "default" 0.0;
+					visible: 1;
+                                        rel1.relative: 0.0 0.0;
+                             		rel1.offset: 27 0;
+                                        rel2.relative: 1.0 1.0;
+                                        rel2.offset: -27 -1;
+                                        color: 255 255 255 255;
+                                }
+			}
+			part
+			{
+				name: "ephoto.swallow.content";
+				type: SWALLOW;
+				clip_to: "image_area";
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					rel1.to: "image_area";
+					rel1.relative: 0.5 0.5;
+					rel1.offset: 0 0;
+					rel2.to: "image_area";
+					rel2.relative: 0.5 0.5;
+					rel2.offset: 0 0;
+					color: 255 255 255 255;
+				}
+				description
+                                {
+                                        state: "hidden" 0.0;
+                                        inherit: "default" 0.0;
+                                        visible: 0;
+                                        color: 255 255 255 0;
+                                }
+			}
+			part
+			{
+				name: "move_left";
+				type: IMAGE;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					min: 27 42;
+					max: 27 42;
+					rel1.relative: 0.0 0.5;
+					rel1.offset: 30 0;
+					rel2.relative: 0.0 0.5;
+					rel2.offset: -1 -1;
+					image.normal: "move_left.png";
+				}
+			}
+			part
+                        {
+                                name: "move_right";
+                                type: IMAGE;
+                                mouse_events: 1;
+                                description
+                                {
+                                        state: "default" 0.0;
+                                        min: 27 42;
+                                        max: 27 42;
+                                        rel1.relative: 1.0 0.5;
+                                        rel1.offset: 0 0;
+                                        rel2.relative: 1.0 0.5;
+                                        rel2.offset: -30 -1;
+                                        image.normal: "move_right.png";
+                                }
+                        }
+		}
+		programs {
+                        program {
+                                name: "hidden";
+                                signal: "ephoto.browser.hidden";
+                                source: "ephoto";
+                                action: STATE_SET "hidden" 0.0;
+                                transition: LINEAR 0.6;
+                                target: "ephoto.swallow.content";
+                        }
+                        program {
+                                name: "visible";
+                                signal: "ephoto.browser.visible";
+                                source: "ephoto";
+                                action: STATE_SET "default" 0.0;
+                                transition: LINEAR 0.6;
+                                target: "ephoto.swallow.content";
+                        }
+                }
+	}
 }
 
diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am
index 0f6573c..88c8f74 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -17,4 +17,5 @@ sb_runnerv.png \
 move_left.png \
 move_right.png \
 selected.png \	
-thumb_shadow.png
+thumb_shadow.png \
+left_arrow.png
diff --git a/data/themes/default/images/left_arrow.png b/data/themes/default/images/left_arrow.png
new file mode 100644
index 0000000..cf56fe1
Binary files /dev/null and b/data/themes/default/images/left_arrow.png differ