Fixed #9 and refactored drop downs