Move section to sub section of CF demo
Fix some texts