Change UX and integration with backend