Fix a couple problems with the screens