bugs
fix layout pagination
fix layout pagination