more refactoring, added level choosing scene