Restructuring the dom a bit