Add multiple display support to DisplayManager
Clean DisplayManager of debugging code