Some layout improvements on alert tool