Added error display and formatted code
Merge branch 'User-Interface'