Bug 988177 - Extract UI to remove bookmarks