[#82672374] make layout responsive
merge fix