Button methods refactoring
Enabled outside access for refactored methods (external buttons bindings possibility)