Tracker: migrate to use layouts.