More tidying up logic for is displayed
more sensible function naming