Added buttons and functionality