- simplify the css class handling
- avoid the jumping lines