Update GUI to include latest baseline
Update gui with latest code and merge with upstream