Add option to change number of columns