bugfix + custom css classes