Fix some corner case responsive bugs
More corner cases