JS AND CSS FIXES