Cleanup imports
Added button to error dialog