<DA-392> fixed CSS errors
Merge branch 'DA-392' into unstable

* DA-392:
  <DA-392> fixed CSS errors