Fixed some bug in UIs