Design related changes and message box validation