DEP UX and UI solution