Fix bookmarks
Fix visitor_signs_up spec
Refactoring Message and Topic includes