Added Static Templates & MVC