Some HTML and CSS tweaking to layout better.