Two screen mode fixes

Fixed a number of little issues when in two screen mode