Fixed the menu and some space problems