8945 aui mdi

Here are my latest modifications on the code