Adding screens

Changes non-screen system to Game-Screen pattern