JS and CSS fix