improve bookmarks and add a view for bookmark button to allow it in the bootstrap nav menu
Merge remote-tracking branch 'origin/master'