Small update. More simplification, More Qt.