Fix styling and demo overriding