add responsive fixes part1
merge wirt upstream
add responsive fixes pasrt2