Adapt to changes in GUI