refactoring ui
refactoring - checkpoint for the day