Basic demo - cleanup and show columns example

Small refactoring and include 16 and 10 column examples.