Cleanup design, add editable fields for alerts.