Rolled back scaffolding, changed the bookmarks model a bit.