improve index page
Merge branch 'master' into user
update master