Fix some bugs UI