Screens fixed!

Major update to code