First shot in UI refactoring (cf #62)