Another round of desktop fixes. (nav)