qml refactoring
qml refactoring