Add labels for demo and add option to show or hide column border