ui and logout changes