[FIX] Improve the UI
Code refactoring