Various text and layout changes made re: #156