Fix some UI and add some error handlers