Refactors and resize handling attempts