Signal refactoring corrected
Fix signals, connect, imports