Change rounding back to floor, add 5px grace zone