related widgets structure upgrade
resolved conflict