more refactoring, prettier buttons