Fixed labels.
Removed page numbering from first page of each unit.
Consolidated local macros.