cleanup rewrites, added js, started rich display