Updates to controllers and register template