Make response layout more robust