added a sexy menu
Merge branch 'website' into staging2