Homepage changes

Waiting on comment from Hadi or Mona before merging this one.