Added latest GUI code