Initial display changes as per discussion with Rob R and Jared J