Update UI & flow (not shown automatically, not shown in 'commit', 'branch'...), close #32