Fix total page count detection
Various updates for the new layout