shined up Cycle layout and fixed ZDS deployment bug