Added StartupDesktop and resulting refactoring.