fix form serialization and remove table gap