Updated layout & wording