Reorg
Better control item spacing