CSS JS Fixes