Changed the logic of scenes for easy switching
Changed logic of scenes to a Screen to accomodate easier transitions