updating controllers and templates to more simple strategy