Fix logout and message UI