Misc cleanups
Made more narrow, combined columns