Working on view and fixing the menu