Update controller: restructured
Update controller: secure action
Update template