Updated pagination and tabbing errors