Implement proper support for multiple displays (#1)