Tweaked display, split into files, addded js