Updated buttons and forms