Add social btns to front page and some refactoring