Some small improvements in Desktop application