Final commit before layout change.
Major change of layout.