navbar refactoring
bookmarks editing