Added settings & moved all strings to string.xml