Some changes to the site per req of Minh
Merge commit '7d3a0d5b0e914f9600f1fe3ccb4165783266d20d' into gh-pages