Adjustments to markup and styles from PR review