application refactored Logic moved to BookmarkManager