Numerous fixes to demos and styling.