-cleaned up imports
-readded in accidental check-in of changing main screen, will cause NPE
after login however (fix by changing screen log into)