viewer-html merge with recent work(this week)