Fixing some css and js errors