Cleaned up code in startscene and menucomp
Manual merge (resolved a conflict)