added remaining pages and fixes in positioning