Fix for v1.0 prod
Fix conflict
Final commit for index page