Some Fixup, including Menu Bar, Login and Account.