Fixed broken entity model, added summary view