embeded into layout, and changed some structure
designs update