get basic demo working
fix demo bugs
layout tweaks and demo bug fixes