fixed some issues with page 1