Minor alterations.
Tracking folder.
Major alterations: layout rebuild.