Finish reworking the health checker
Update views