Updated templates
Updated methods and preparing for finalizing merge of current webgen code and new Controller actions.