Better responsive grid handling