Construct the structure for sonar section
Add style and fix an error
merge the conflict