Add test & demo for Flowchart; some layout tweaks