relabeled buttons, deleted unused commented out code