Move to pure CAF display and media