checkin latest numbering and css styles
Merge branch 'numbering' into dev