updated the display
stuff
Merge branch 'development'