More cleanup of code. Reverted to old dropdown format