Fix conf and UI