Fixes for js and css