Review and improve the MVC implementation for Edit Layout