Add CanCan + bug fixed