JS and CSS Fixes