Updated cancan and views