More bug fixes on main page