More cleanup

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Add a navigation bar to declarative demos

Signed-off-by: John McCutchan <john@johnmccutchan.com>