Minor css tweaks
Markup fixes