Added Buttons and Functionality