Changes to markup and script