PR changes + admin's controller + cancan gem