Reorder by topic and reorganize to minimize wasted space