Fix and modification to speed-up display

A few modifications to make it works again + a directory structure