General adjustments & some responsiveness support