More styling and HTML adjustment