Fixed the context menu behavior.
Merge. Misc changes and tweaks. Bookmark menu is now functional.