Reworking the view yet again