Some more fiddling with modules, rows and columns