Add more to the lists, and remove the duplicate options in MainActivity