New buttons + refactor