Added buttons and got the in the proper places