Progress in viewer, still need to make some adjustments within the client side.