Changed mark up as per PM request for goal setting. [Finishes #80589044]