More code refactoring!
Code refactor for module generator
Added title when editing control/config
More code refactor for module generator