Added extras pages and some more cleanup