Issue #650 - align controls

Issue #650 - fixed controls aligning