Organize sidebar better