Website 2.0
Merged last changes
Fixed issue due to last merge