additional markup and some styles updates