cleanup and moving some menu items