Rebrand and few updates