Various template cleanups and fixes, with particular attention paid
to reducing boilerplate markup in action sidebars.