changes to main page
Merge