Make truncation/wrapping glyph more obvious, and move some stuff around