UI adjustment
Redesign little part of UI code