Some changes, still not working properly, stucks after few normal resizes