Added window layout save for Issue 25