Changes in the main page
Merge with Fernando file