Fixes in main page