Improve editor layout for mcp
	Merge remote-tracking branch 'upstream/master'