Updated MVC layout