Correct bookmark module after bookmark page changes + minor fixes
Merge pull request #75 from ravomavain/pull_bookmark_fix

[Bookmark] Correct bookmark module after bookmark page changes + minor fixes