Fix displays to work with the new system