form instance revamp and bug fixing