some benign edits to prepare for merging in of code for new screen
Code for new screen merged in