Various cosmetic improvements.  Some refactorings to avoid duplication.
Fix filter row not turning off when filtering is disabled.
Merge branch 'feature/improve-styling' into develop