Index page fixes