added back focus states, still have a few bugs with dropdowns