Revert "Revert "Even cooler expanded desktop""

This reverts commit e1f4ecbd315dde99e551b7d9c3c758b1900ee906.