Dev display

Merging dev_display to master