Better fonts support. Some minor layout change.