New branding for whole site, fixing and cleaning up code