Corrections and mapping changes in GUI.