Disabled inputs id external domain
OU icon fix and minor refactoring