Sidebar templates cleaned for #35.