organized page a bit to prep for #395
old