Changes to StructViewer, ARE creation and some clean ups