Major layout changes for MainActivity and SettingsActivity