Change design to MVC