Renamed Multi-Column to Multicolumn and refactored some code