minor UI adjustment
Merge branch 'feature/web_ui' into scala_2.11

* feature/web_ui:
  minor UI adjustment