add structure changes and topbarview