Huge layout update and branding definitions