Updated template and organization pages