TextViewer improved