Much better place.  popups working, dropdown logic working