Added buttons in the proper spots!