Changed definition to UITextView and added borders
Merge remote-tracking branch 'origin/dev' into edo