Dropdown list added and some code updates