Further updates to template for org list