Fixed OptionMenu & bugs in Listener