Added scene-handling to app