Various MVC modifications