Related to #140, better display. Still needs some testing.