More tweaks/refinement for resizing/maximizing