added current page highlighting and minor tidyup