edited display of what was being displayed
Merge branch 'dev'
gulped