Windowed + Non-Primary Monitor Fix

Fixed issue with windowed + non-primary monitor users

Fixed issue with vaulted status of eqmt

Note: This release is actually for the next commit, I released then pushed my changes.