Fixing spacing in sidebar
Fixing conflict