UI tweaks, move a couple old screens to keep out of MenuScreens.cpp