Deletion and screen refresh fixed