Scanner improved. Cleanup.
First implementation of two column view.