Some fixes on main page