fix for when the toolbar isn't used.
refactor marker visibility methods