added dropdownjs & cleanup