Fixed bugs for the next page