rev catalog.json
refactor into BB View Models
add expand-all functionality