Improved resize and account behavior