[Changes] polish ui and logic