added cell layouts
fixed some layouting inconsistency