Refactored bookmarks into a single partial