Properly fix window gaps