Revert "Arrange Cycles nodes"

This reverts commit 2565b2195b6ec5f0034309eae037fe38fb047f63.
Revert "Revert "Arrange Cycles nodes""

This reverts commit 933a21235115f84c50d4295847346469a1cb797d.