Update demo link and reorder demo