Improve implementation of Catalyst viewer

Change-Id: Ibf305a1ea35b426e35dd43caf263861bdcb69381
Merge topic 'catalyst-web' into master

697d1785 Improve implementation of Catalyst viewer