redesign model and UI