Cleanup verification handling, add error panel