Updated styling, and began to fix sidebar
Fixed merge conflicts