Updated to use latest GUI code