Fixes as per UAT
Moved logout link to menu bar