improve layout of the flexibility estimator
Update entity names for shorter ones