Resize + preformance fixes