Rebrand: Cleanup Settings Page, Fix logout