Many changes on home and article templates