PageViewer handlers and some renaming.