Bookmark Item Refactor