modified layout and added cancan