Some changes, new pages for pool