Minor tweaks: desktop switch