This should fix the screen problems. Should have been committed earlier, and is mostly copy and pasted from the MainActivityScreen class.