Minor layout markup tweaks.