A few tweaks on main and index pages