Removed references to (unused) desktop-menu. Moved code around.