menu overhaul (WIP)