Merge from Susanne:
- major update of data dispaly