More sidebar cosmetic changes
Merge