refactoring
added drop-down box events