Added button functionality
Fixing merge conflicts