Updating gui per Elena's suggestions