Added Buttons and finished linking