Tidy up some more view strings and refactor.