Bug 988174 - Extract UI to edit bookmarks
Bug 988177 - Extract UI to remove bookmarks