clean up toolbar, remove map operations
remove flicker on page refresh
merged from master