Solve some responsive bugs