Refactoring
Added menus and extras to layout