refactored UX/UI