fix css
Merge branch 'DA-367' into unstable

* DA-367:
  fix css