Fixed TZ bug / fixed hanging UI component