Finished adding button handlers