Fixed issues related to UI