Improve catalyst web UI

Change-Id: Ibcb0fbb3e84e913746894d3659cc53c8e89ea296
Merge topic 'catalyst-web-composite' into master

8ef209ed Improve catalyst web UI