Changed to use MVC for all the pages