Rebranding and markup improvements