finished changes to support client branding