added cancan, fixed layout issues