cancan update
minor updates to layout