Added menus, add MVC design