new ui layout
Some refactoring of method names. tidy up of deprecated code. new test.
Simplified HealthFilter code.