Added better parsing and pages