Tweak unit radius and height, fix whitespace