Layout improvements in index_as grid and list