More refactoring, QML