Add comments to Org views and forms