Removed duplicate button registrations
Complies with tests now.