More JS and CSS improvements