rename some buttons and fix unselect vs select user dilemma