Revert "old updates"

This reverts commit cc5da6eed7edd2f55add1252b80f863fc936407e.
Revert "Revert "old updates""

This reverts commit 4c2f0ec7ed4e4cdd0c7d4d6ec2ca8b6742a06b80.
Updates to the template and the controller