tweak templates, a-x push to prevent oops
tweak layout, correct header oops
add goofy title