Refactor some layouts, includes, put trailer in place.