Few Markup and style fixes