Issue #650 - align controls