Remove padding of some empty elements; Fix geshi issues