GUI reorganized.