fix issues with dialogs in splash screen,
also fix some typos in other code
Merge branch 'DA-302' into unstable

* DA-302:
  fix issues with dialogs in splash screen, also fix some typos in other code