CSS and JS Fixes