big menu redesign, still needs tweaks