Tweaked button functionality a little