Trouble shooting updates & fixed multi-page issue