Track our display & media

jb mr2 fixes