Made menus more structurally acurate