finish UX/UI