fix button styling and small refactor