Moved update logic into the event handlers and out of the Bookmark creation logic