Cleaned up the menu