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

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