Refactor NamespaceInputWidget