Improvements on the index page and menu