#158 More progress with config screens