Improve / fix FactoryWrapperPtr
Improve design window classes