More cleanup.

The Add bookmark popover is now hooked up. Still need to actually
create the system to save and retrieve bookmarks, but that should be
pretty straightforward.