Refactoring and new buttons