Enhancements to the Align tool