Fixes and WiP Menus