Button pause refactoring. See #22