Restructured map draw function, to draw progressively in columns. Improved readability of code