divs again :(
Merge branch 'div-cleanup'