Decoupled main form
Decouple UI setup from controllers
Moving stuff around