Refactoring, migrated and outsourced first button