Added aux data, some ui classes