Added menu
Fixed problem with drop-down list