Remove dependence on j-mode, arrange everything in columns