Tidying up for merge

Tidying up for merge - fix broken things when configured in Stanford
mode
Stanford fix of style on landing

Stanford fix of style on landing