Final stability fix. Startup UI fixes