cleaned up controllers and conditional map loading