Added attribution messages
Simplified button checking