Changed index page
Merged with develop