Refactor hb-view code
6 files changed