Added cocktail names & streamlined prefs input