Reorganize divs to fix formatting problem