JS and CSS fixes 2