Refactor/bookmarks view

Avoid using {...} for multi-line blocks.