Some fixes in main page