Started working on cycle pages, minor fixes/changes