I need help with my Google Bookmarks?

Ok, so, I had all my bookmarks in Google Bookmarks and using Firefox, which worked really well, and they would show up in Google searches and everything. But then Google decided to not update Google Toolbar for Firefox anymore, and I’m having trouble finding a suitable add-on for Google Bookmarks. I need one that will let me add new bookmarks without opening a whole new Bookmarks tab, add labels/folders to that bookmark while adding it while also suggesting pre-existing labels so I don’t end up creating 5 different version of what is essentially the same label (eg French Revolution and French Rev and French Rev. and FR), and let me do some amount of editing without having to open up a whole new Bookmarks tab. Also, bonus if it will let me have labels within labels (like French Revolution within a larger History folder).

Thanks!