adjustments to front page
fix merge
Merge branch 'fp'