Cleanup and reordering of Viewer methods.