Merge 1.5
Responsive sidebar fix