Rearrange layout, make grid consistent