Sidebar cleanup, error fix.