Restructure

view style: