Added other buttons and functionality