Separate wrapper from grid
Added padding and changed cname
Fixed merge conflicts