update, UI and organization