JS and CSS fixes