Updated buttons and functionality