Responsive sidebox update
Merge from sprint2