Some fixes in domain ui