WM: Updated tabbed content and info-lists
WM: Button content updates
Merge branch '38_template_integration' of github.com:onaio/ona-viewer into 38_template_integration