added some overrides and fixed logo