fixed some issue and adding all pages