Added default button detection / Fixed startup order