Refactored bookmarks to use a form partial