Menu Rework 90% Done