Fix and improve MainController