made menu structure more consistant