All existing controllers and view edited to work with the new Sub Template
system