More internal changes in Area Viewer (part 2)

- separated data from gui