Cleaned up sidebars in templates