Initial work on a better drop down