UI changes for remote web service caching
Merge branch 'feature/rws-caching' into develop