Feature/multicompanybookmarks

Adds multicompany support to bookmarks plus overall cleanup