Improve folding and fix resize for multiple monitors