Bookmarks UI functionality
Implemented bookmarking functionality
Merge branch 'feature/cfi_bookmarks' into develop