Made some changes on the domain constraints. UI Fixes