Updated buttons and notifcations