Fixing some stuff that broke with the main screen.