Less specific layout selectors, grid update and reorg