Some Expanded Desktop changes