Bring public view in line with the rest of the app