Mostly resizing/positioning fixes