pretty CSS and some JS modifications
post-merger