display function implemented
new display, a bit more representative
Merge branch 'display'