form fixes and scroll following updates