Several fixes (domain aliases - gui)
Refactoring + small fixes