Distributor Entity & some Ui fixes