Reorganizing main layout with linear layouts and weight
Fixing dependency on default values for the GameSettings UnitTest. Since SharedPreferences can change, the values were not matching to make the test pass. The IntegrationTest does a better job at validating that info by resetting the SharedPreferences.