Fixed some bugs and added views for Menu