Merged the rest of changes "QML UI fixies (#4)"