Turn into 4-column grid, replace handle icon
Merge branch master