16th commit

Display and layout near finalization.

Final content needed.