added UX and UI