Rebrand: Cleanup Setting page, Fix logout