Added service selector
Update main form for module generator