not showing root entity summary screen plus some fixes