Major update to the all major components of the system including the bookmarking feature.