Markup and style fixes