Big tidy up, added page list toggle, added in load/save support