windows, fixed sidebar
fixed merge conflicts
fixed merge conflict in index.html
improved scrolling, windows