Some minor refactoring to space race gui
Merge remote-tracking branch 'origin/master'