Fix order and cycle layout