Bug 903401 - Fixing markup and CSS