fixed UI mess
fixed UI mess