Various changes to bring it to the multimon desktop