add trending to rankings section of front page
fixed merge conflicts on main.js