Update gui to use new GUI code