Added some more button functionality