Heavy template changes, Sidebars in place