fixes to menu/option

made some fixes to the classes because they weren't working quite right