Fixed crash bug on site/new and cleaned up pagination situation