Fixed UI issuse