Work on UI
Refactoring