Minor changes for UI and Email reporter