fixed some alignments using new classes