Added session checks on all pages and requests
Merge