Added Cycle Action + supporting GUI
General cleanup and minor refinements