Fix logout button and welcome message

Change-Id: I1e4fda786ec4a785925178e59898b5f991dc8d39