css formatting, monor style fixes, demo with buttons