Menu Tweaks and Build prep