Fixed issues related to UI display.