Add labels and change wording