Fixing issue with ResetDefaultLayout again.