Removed whitespaces in state names
replaced spinner and update button with menu items