Cleaned up message boxes and error notifications