More QML refactoring