Changes to MyListsActivity and ListSettingsActivity
Fixing conflict