Demo style update
Demo style improvement
Merge branch 'design'