Added 'logoutmenu' but disconnect missing? Some minor improvements