Some changes to the site per req of Minh