Fix Some UI Issue