Changed re-labeling text and buttons