Formatting changes and TextArea input dialog
Fixing merge conflicts