new styles and beginning of template clean up