several fixes to numbering system and css styles