Various Cap layout changes.