Modified to fit refactored textView/EditText formatting (now done by model)