#642 Updated UI to work with new template ID sent back from server in the template type objects