fixed ordering of attributes and added a few missed control-label classes