Added Data Sanitization and Icons