More internal changes in Area Viewer