Use text area for address
Merge branch 'leon'