Tweak the markup to look a little better.