Some responsive fixes