Changes to markup and css