Cleaned up the menu some