Small rehaul of track and automation track headers. This should now