Revert "Working with adding bookmarks"

This reverts commit 8424f5790aac941038d2457c5e4ee11bd9a5a5cd.
Refactoring