Refactoring/cleanup
Recording of log-entry-level alerts
Re-enabled basic alert view after refactoring