Final pushes for button and form fixes