Begin GUI update and fix #2101.