Fixed more bugs relating to complete logout, another UI fix