[Tak] Improving UI