Some markup and style fixes