adding css helpers, changing some vocabulary and structure