updated UI, added SMS
merged conflicts