Adding bookmarks link and fixing some rspec failures. DHH-437