Button helpers refactoring
Button helpers refactoring