Add layout, persistency, ui