Refactor button labels into hash
Remove commented code from button