fixed the index page
merged with origin