Few main page improvements