JAL-2388 Removing AlignmentPanel dependency (mostly)