UI Redesign
Fixed merge conflict in js
Added popular sites
Merge pull request #78 from marc-roopchand/master

UI Redesign