** Updated settings views for new entity+DAO