Made various improvements
Added MVC functionality