Lots of minor cleanup in JS, styling