lots of visual fixes [skip ci]