Some more GUI positioning tweaks