Fixed the data structure issue with adding bookmarks, the bookmarks page has a problem though