Made more changes to the templates, new styles