Merge change Ia3f2b98b

* changes:
  Cosmetic fixes in css/js