Fixed broken sms state radio button saving and changed contact labels to text fields. Also general code clean-up.
Fixed merge errors