Form + performance improvements