Layout engine, window naming, minor tweaks