UI View management fixes