Issue #650 - align controls
Merge pull request #666 from olga-jane/Protsenko_construction

Issue #650 - align controls at settings and new pipe + rename