Fix issues on and added branding