removed nested labels

removed nested labels & some macros changed to theirs n:attr notation