Update Demo button
Use correct comment style in markup
Fix bugs in markup
Add actions button back and collapsible section