improve the viewer for the first load