small refactor & buttons