Clean up sidebar
Split sidebar into 2 sections