CanCan added and bug fixed