Fixed issue in menu and improved style