fleshed out rest of screens. re #10
Re #10
fix.  Re #14