Restructured, added options to determine how many columns should be displayed