Changes to wrapper and buttons
Removed console.log used for testing