First steps towards a fuller desktop experience
Merge branch 'guiImprovement'