Made OptionMenu better