JAL-974 - use refactored methods on AlignmentPanel