Develop

My CSS refactoring commit actually broke a lot of things which I didn't notice because of caches. Fortunately I was able to remove it through a git rebase -i and I pushed it to a branch. I've confirmed that things work again and it's safe to merge.