changed variable names for consistency

moved menu items into the menu bar