improved column layout, minor cleanups