template/user views/controllers updated