Finished teh Cycle2 style issues, and changed everything to the new template.