fixed bookmarks map and took out tools

Fixes #137