Refactored mci controller and views
Cleanup