Fixed and simplified Expanded Desktop