updated gui to new structure