Organized panels, added controllers