JS and CSS improvements