updating with better nav for bookmarks