cleaning up viewer
polish viewer
merge master