Faster area display.
Some refactoring.