Improve robustness of UI