Main page fixes