fix overlapping divs and wrapping and margins