Fill gaps in presentation and reorganize