Issue #2324363 by jhodgdon: Make order of stuff on all pages consistent and logical