Changes to UI and Error Reporting