Relabeled buttons for more consistency