Updated handling of guest toolbar