Updating views
Removed bookmarklet page
Updated navigation links
Fixed merge