fixes on empty states and nav copy change
Merge branch 'walport-water' into testing