Adding some multi-monitor support