slightly improved responsiveness
conflict
small style changes