More refactoring toward MVC
Refactored controls for auto-regeneration