For nice merging

please merge this!
You missed some close divs. I'll fix it.