Not sure if working, no chance to debug.
Basic refactoring.
A bunch of errors is handled. Start game dialog is rather stable now