Update GUI code to latest branch