modified pages for bookmarks, user handling fix