Input fixes
Changes to display of errors and notifications
Merge branch 'Friends'