fixed refreshing of data in GUI; simplified relationships in model