Optimize js and css tweaks