css fixes
Merge branch 'asta'