Many improvements

CanCan
Design