fixing bugs on more pages