Refinement to alignment commands and UI