Fixing view.
Merge branch 'release-2.0' of github.com:dchbx/hbx_enterprise into release-2.0