Issue #109 - Modifying the layout and finalizing the UserStory