fixed creator class and forms