Change over to MVC frame work