More markup and layout changes.